From c10d6892a277e5ba75a82a6b4fed58e2a01e25a2 Mon Sep 17 00:00:00 2001 From: Mylene Date: Mon, 27 Jul 2015 12:29:48 +0200 Subject: [PATCH] cleaning sass --- css/style.css | 112 +++++++++++++------------- js/theme_option.js | 12 --- sass/{ => base}/_commons.sass | 0 sass/{ => base}/_fonts.sass | 0 sass/{ => base}/_utils.sass | 0 sass/{ => base}/_var.sass | 0 sass/{ => layout}/_menu.sass | 0 sass/{ => layout}/_modal.sass | 0 sass/{ => layout}/_postboard.sass | 0 sass/{ => layout}/_profile.sass | 0 sass/{ => layout}/_responsive.sass | 0 sass/{ => layout}/_tabs.sass | 0 sass/{ => layout}/_who-to-follow.sass | 0 sass/{ => pages}/_following.sass | 0 sass/{ => pages}/_login.sass | 0 sass/{ => pages}/_network.sass | 0 sass/style.sass | 33 ++++---- 17 files changed, 74 insertions(+), 83 deletions(-) rename sass/{ => base}/_commons.sass (100%) rename sass/{ => base}/_fonts.sass (100%) mode change 100755 => 100644 rename sass/{ => base}/_utils.sass (100%) mode change 100755 => 100644 rename sass/{ => base}/_var.sass (100%) mode change 100755 => 100644 rename sass/{ => layout}/_menu.sass (100%) mode change 100755 => 100644 rename sass/{ => layout}/_modal.sass (100%) rename sass/{ => layout}/_postboard.sass (100%) rename sass/{ => layout}/_profile.sass (100%) mode change 100755 => 100644 rename sass/{ => layout}/_responsive.sass (100%) rename sass/{ => layout}/_tabs.sass (100%) rename sass/{ => layout}/_who-to-follow.sass (100%) rename sass/{ => pages}/_following.sass (100%) mode change 100755 => 100644 rename sass/{ => pages}/_login.sass (100%) rename sass/{ => pages}/_network.sass (100%) mode change 100755 => 100644 diff --git a/css/style.css b/css/style.css index 49740ac..4570a2f 100644 --- a/css/style.css +++ b/css/style.css @@ -1,4 +1,60 @@ @charset "UTF-8"; +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font: inherit; + font-size: 100%; + vertical-align: baseline; +} + +html { + line-height: 1; +} + +ol, ul { + list-style: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +caption, th, td { + text-align: left; + font-weight: normal; + vertical-align: middle; +} + +q, blockquote { + quotes: none; +} +q:before, q:after, blockquote:before, blockquote:after { + content: ""; + content: none; +} + +a img { + border: none; +} + +article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { + display: block; +} + @font-face { font-family: "Roboto"; src: url("fonts/roboto/Roboto-Regular.ttf"); @@ -186,62 +242,6 @@ } /* '' */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font: inherit; - font-size: 100%; - vertical-align: baseline; -} - -html { - line-height: 1; -} - -ol, ul { - list-style: none; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -caption, th, td { - text-align: left; - font-weight: normal; - vertical-align: middle; -} - -q, blockquote { - quotes: none; -} -q:before, q:after, blockquote:before, blockquote:after { - content: ""; - content: none; -} - -a img { - border: none; -} - -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { - display: block; -} - .col, .following, .following-list li, .login .module, .network.singleBlock .module, .twister-user { float: left; margin: 0 2.5% 0 0; diff --git a/js/theme_option.js b/js/theme_option.js index 6b940a1..aca29b2 100644 --- a/js/theme_option.js +++ b/js/theme_option.js @@ -31,10 +31,6 @@ $(function(){ $(this).prependTo($(this).parent()); }); - // open-following-page - - - $( '.userMenu-home.current a' ).on( 'click', function() { $('html, body').animate({scrollTop:0},300); @@ -42,7 +38,6 @@ $(function(){ }); - $( ".promoted-posts-only").click(function() { // modify the way promoted posts are shown @@ -77,11 +72,6 @@ $(function(){ - - - - - function localizeLabels() { $("label[for=tab_language]").text(polyglot.t("Language")); $("label[for=t-2]").text(polyglot.t("Theme")); @@ -94,8 +84,6 @@ function localizeLabels() { function openModal(modal) { window_scrollY = window.pageYOffset; - //$('body').css('overflow', 'hidden'); - if (!modal.classBase) modal.classBase = '.modal-wrapper'; diff --git a/sass/_commons.sass b/sass/base/_commons.sass similarity index 100% rename from sass/_commons.sass rename to sass/base/_commons.sass diff --git a/sass/_fonts.sass b/sass/base/_fonts.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_fonts.sass rename to sass/base/_fonts.sass diff --git a/sass/_utils.sass b/sass/base/_utils.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_utils.sass rename to sass/base/_utils.sass diff --git a/sass/_var.sass b/sass/base/_var.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_var.sass rename to sass/base/_var.sass diff --git a/sass/_menu.sass b/sass/layout/_menu.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_menu.sass rename to sass/layout/_menu.sass diff --git a/sass/_modal.sass b/sass/layout/_modal.sass similarity index 100% rename from sass/_modal.sass rename to sass/layout/_modal.sass diff --git a/sass/_postboard.sass b/sass/layout/_postboard.sass similarity index 100% rename from sass/_postboard.sass rename to sass/layout/_postboard.sass diff --git a/sass/_profile.sass b/sass/layout/_profile.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_profile.sass rename to sass/layout/_profile.sass diff --git a/sass/_responsive.sass b/sass/layout/_responsive.sass similarity index 100% rename from sass/_responsive.sass rename to sass/layout/_responsive.sass diff --git a/sass/_tabs.sass b/sass/layout/_tabs.sass similarity index 100% rename from sass/_tabs.sass rename to sass/layout/_tabs.sass diff --git a/sass/_who-to-follow.sass b/sass/layout/_who-to-follow.sass similarity index 100% rename from sass/_who-to-follow.sass rename to sass/layout/_who-to-follow.sass diff --git a/sass/_following.sass b/sass/pages/_following.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_following.sass rename to sass/pages/_following.sass diff --git a/sass/_login.sass b/sass/pages/_login.sass similarity index 100% rename from sass/_login.sass rename to sass/pages/_login.sass diff --git a/sass/_network.sass b/sass/pages/_network.sass old mode 100755 new mode 100644 similarity index 100% rename from sass/_network.sass rename to sass/pages/_network.sass diff --git a/sass/style.sass b/sass/style.sass index b1f5d48..5002611 100755 --- a/sass/style.sass +++ b/sass/style.sass @@ -1,24 +1,27 @@ -@import _fonts + @import compass @import 'compass/reset' @import 'compass/utilities' -// utils - -@import _var -@import _commons -@import _utils +// base +@import 'base/_fonts' +@import 'base/_var' +@import 'base/_commons' +@import 'base/_utils' // layout -@import _menu -@import _modal -@import _profile -@import _postboard -@import _following -@import _login -@import _network +@import 'layout/_menu' +@import 'layout/_modal' +@import 'layout/_profile' +@import 'layout/_postboard' + +// pages + +@import 'pages/_following' +@import 'pages/_login' +@import 'pages/_network' -@import _tabs +@import 'layout/_tabs' @@ -764,4 +767,4 @@ ul.dropdown-menu color: #B4C669 -@import _responsive +@import 'layout/_responsive'