From c98e068f36d795369c5323f4269469e99fbd2cf4 Mon Sep 17 00:00:00 2001 From: Mylene Date: Tue, 28 Jul 2015 10:46:59 +0200 Subject: [PATCH] templating --- css/style.css | 62 +-------------------------------------------- sass/base/_var.sass | 29 +++------------------ sass/style.sass | 4 --- 3 files changed, 4 insertions(+), 91 deletions(-) diff --git a/css/style.css b/css/style.css index 75dcd78..f373de7 100644 --- a/css/style.css +++ b/css/style.css @@ -1,5 +1,4 @@ @charset "UTF-8"; -@import url(../css/jquery.mCustomScrollbar.css); html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -243,65 +242,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, } /* '' */ -.col { - float: left; - margin: 0 2.5% 0 0; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -.col.last { - margin-right: 0; -} - -.col-1 { - width: 1.875%; -} - -.col-2 { - width: 6.25%; -} - -.col-3 { - width: 10.625%; -} - -.col-4 { - width: 15%; -} - -.col-5 { - width: 19.375%; -} - -.col-6 { - width: 23.75%; -} - -.col-7 { - width: 28.125%; -} - -.col-8 { - width: 32.5%; -} - -.col-9 { - width: 36.875%; -} - -.col-10 { - width: 41.25%; -} - -.col-11 { - width: 45.625%; -} - -.col-12 { - width: 50%; -} - /* FONTS */ * { outline: none !important; @@ -428,7 +368,7 @@ h3 .isFollowing:after { box-shadow: 0 8px 13px rgba(17, 17, 17, 0); } -.clear-fix:after, .col:after, .userMenu ul:after, .modal-content:after, .modal-header:after, .direct-messages-thread .post:after, .mini-following-info a:after, .forEdition.profile-card:after, .expanded-content:after, .following .following-list li a:after, .network.singleBlock:after, .options .tab-content:after, .promoted-posts-only:after, ul.userMenu-search-profiles li:after, .mini-profile .post-area:after, .mini-profile-indicators:after, .profile-data:after, #postboard-top:after, #postboard-top .post-area:after, .who-to-follow ol:after, .twister-user:after { +.clear-fix:after, .userMenu ul:after, .modal-content:after, .modal-header:after, .direct-messages-thread .post:after, .mini-following-info a:after, .forEdition.profile-card:after, .expanded-content:after, .following .following-list li a:after, .network.singleBlock:after, .options .tab-content:after, .promoted-posts-only:after, ul.userMenu-search-profiles li:after, .mini-profile .post-area:after, .mini-profile-indicators:after, .profile-data:after, #postboard-top:after, #postboard-top .post-area:after, .who-to-follow ol:after, .twister-user:after { content: ""; display: table; clear: both; diff --git a/sass/base/_var.sass b/sass/base/_var.sass index b706f74..950ec17 100644 --- a/sass/base/_var.sass +++ b/sass/base/_var.sass @@ -2,32 +2,9 @@ -// G R I D - -$grid_width : 50% // grid width % -$grid_max_width : 100% // max width -$grid_cols : 12 // cols number -$grid_gut : 2.5% // gut width % -$grid_col : ($grid_width - ($grid_gut * ($grid_cols - 1))) / $grid_cols -$class-col : col !default - -.col - float: left - margin: 0 $grid_gut 0 0 - +box-sizing(border-box) - @extend .clear-fix - &.last - margin-right: 0 -@for $i from 1 through $grid_cols - $j: $i - 1 - .#{$class-col}-#{$i} - width: ($i * $grid_col) + ($j * $grid_gut) - - -// vars used for the website - -$site-width : $grid_max_width -$gut-width : $grid_gut + +$site-width : 100% +$gut-width : 2.5% $space : 1rem // colors diff --git a/sass/style.sass b/sass/style.sass index 6fa8358..b81bd30 100755 --- a/sass/style.sass +++ b/sass/style.sass @@ -1,7 +1,3 @@ - -@import '../css/jquery.mCustomScrollbar.css' - - @import compass @import 'compass/reset' @import 'compass/utilities'