Browse Source

cleaning sass

nin-v2
Mylene 9 years ago
parent
commit
c10d6892a2
  1. 112
      css/style.css
  2. 12
      js/theme_option.js
  3. 0
      sass/base/_commons.sass
  4. 0
      sass/base/_fonts.sass
  5. 0
      sass/base/_utils.sass
  6. 0
      sass/base/_var.sass
  7. 0
      sass/layout/_menu.sass
  8. 0
      sass/layout/_modal.sass
  9. 0
      sass/layout/_postboard.sass
  10. 0
      sass/layout/_profile.sass
  11. 0
      sass/layout/_responsive.sass
  12. 0
      sass/layout/_tabs.sass
  13. 0
      sass/layout/_who-to-follow.sass
  14. 0
      sass/pages/_following.sass
  15. 0
      sass/pages/_login.sass
  16. 0
      sass/pages/_network.sass
  17. 33
      sass/style.sass

112
css/style.css

@ -1,4 +1,60 @@
@charset "UTF-8"; @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-face {
font-family: "Roboto"; font-family: "Roboto";
src: url("fonts/roboto/Roboto-Regular.ttf"); 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 { .col, .following, .following-list li, .login .module, .network.singleBlock .module, .twister-user {
float: left; float: left;
margin: 0 2.5% 0 0; margin: 0 2.5% 0 0;

12
js/theme_option.js

@ -31,10 +31,6 @@ $(function(){
$(this).prependTo($(this).parent()); $(this).prependTo($(this).parent());
}); });
// open-following-page
$( '.userMenu-home.current a' ).on( 'click', function() { $( '.userMenu-home.current a' ).on( 'click', function() {
$('html, body').animate({scrollTop:0},300); $('html, body').animate({scrollTop:0},300);
@ -43,7 +39,6 @@ $(function(){
$( ".promoted-posts-only").click(function() { $( ".promoted-posts-only").click(function() {
// modify the way promoted posts are shown // modify the way promoted posts are shown
//active promoted posts tab //active promoted posts tab
@ -77,11 +72,6 @@ $(function(){
function localizeLabels() { function localizeLabels() {
$("label[for=tab_language]").text(polyglot.t("Language")); $("label[for=tab_language]").text(polyglot.t("Language"));
$("label[for=t-2]").text(polyglot.t("Theme")); $("label[for=t-2]").text(polyglot.t("Theme"));
@ -94,8 +84,6 @@ function localizeLabels() {
function openModal(modal) { function openModal(modal) {
window_scrollY = window.pageYOffset; window_scrollY = window.pageYOffset;
//$('body').css('overflow', 'hidden');
if (!modal.classBase) if (!modal.classBase)
modal.classBase = '.modal-wrapper'; modal.classBase = '.modal-wrapper';

0
sass/_commons.sass → sass/base/_commons.sass

0
sass/_fonts.sass → sass/base/_fonts.sass

0
sass/_utils.sass → sass/base/_utils.sass

0
sass/_var.sass → sass/base/_var.sass

0
sass/_menu.sass → sass/layout/_menu.sass

0
sass/_modal.sass → sass/layout/_modal.sass

0
sass/_postboard.sass → sass/layout/_postboard.sass

0
sass/_profile.sass → sass/layout/_profile.sass

0
sass/_responsive.sass → sass/layout/_responsive.sass

0
sass/_tabs.sass → sass/layout/_tabs.sass

0
sass/_who-to-follow.sass → sass/layout/_who-to-follow.sass

0
sass/_following.sass → sass/pages/_following.sass

0
sass/_login.sass → sass/pages/_login.sass

0
sass/_network.sass → sass/pages/_network.sass

33
sass/style.sass

@ -1,24 +1,27 @@
@import _fonts
@import compass @import compass
@import 'compass/reset' @import 'compass/reset'
@import 'compass/utilities' @import 'compass/utilities'
// utils // base
@import 'base/_fonts'
@import _var @import 'base/_var'
@import _commons @import 'base/_commons'
@import _utils @import 'base/_utils'
// layout // layout
@import _menu @import 'layout/_menu'
@import _modal @import 'layout/_modal'
@import _profile @import 'layout/_profile'
@import _postboard @import 'layout/_postboard'
@import _following
@import _login // pages
@import _network
@import 'pages/_following'
@import 'pages/_login'
@import 'pages/_network'
@import _tabs @import 'layout/_tabs'
@ -764,4 +767,4 @@ ul.dropdown-menu
color: #B4C669 color: #B4C669
@import _responsive @import 'layout/_responsive'

Loading…
Cancel
Save