From febce7025583e2c8ca988141669516b65d836324 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Sun, 30 Sep 2018 23:06:08 +0500 Subject: [PATCH] strip trailing spaces in sass/* --- sass/base/_commons.sass | 35 +++++---- sass/base/_fonts.sass | 10 +-- sass/base/_utils.sass | 24 +++---- sass/base/_var.sass | 11 ++- sass/layout/_dm.sass | 23 +++--- sass/layout/_groupchat.sass | 60 ++++++++-------- sass/layout/_menu.sass | 34 ++++----- sass/layout/_modal.sass | 82 +++++++++++---------- sass/layout/_postboard.sass | 56 +++++++-------- sass/layout/_profile.sass | 17 +++-- sass/layout/_prompt.sass | 20 +++--- sass/layout/_responsive.sass | 38 +++++----- sass/layout/_wrapper.sass | 16 ++--- sass/pages/_following.sass | 29 ++++---- sass/pages/_login.sass | 25 ++++--- sass/pages/_network.sass | 21 +++--- sass/pages/_profile.sass | 40 +++++------ sass/style.sass | 136 +++++++++++++++++------------------ 18 files changed, 334 insertions(+), 343 deletions(-) diff --git a/sass/base/_commons.sass b/sass/base/_commons.sass index c3c285a..e9f0a17 100644 --- a/sass/base/_commons.sass +++ b/sass/base/_commons.sass @@ -8,16 +8,16 @@ html, body min-height: 100% color: $defaut-font-color - position: absolute + position: absolute width: 100% -html +html font-size: $global-font-size background-color: #ddd background-image: image-url("bg.png") background-attachment: fixed -body +body font-size: $main-font-size line-height : $main-line-height font-family : $main-font-family, "Symbola" @@ -26,25 +26,25 @@ body -a +a text-decoration: none color: $main-color-color &:hover, &:active color: $main-color-color text-decoration: underline - i + i text-decoration: underline font-style: normal -i, em - font-style: italic +i, em + font-style: italic font-family: $serif-font-family letter-spacing: 0 -strong, b +strong, b font-weight: 600 -img +img background: $bloc-background-color h1 @@ -64,12 +64,12 @@ h3 font-weight: 400 line-height: 1.1em -br +br display: block -textarea, input - background: white - display: block +textarea, input + background: white + display: block border: none font-family: "Monospace", $main-font-family font-size: .8rem @@ -81,19 +81,19 @@ samp font-size: 11px line-height: 11px display: inline-block - padding: 5px + padding: 5px +border-radius(1px) font-weight: 500 font-family: monospace word-wrap: break-word - + /* isFollowing */ .isFollowing @extend .ion-checkmark @extend .ion-after - &:after + &:after color: $main-color-color padding-left: 3px display: inline @@ -103,6 +103,5 @@ samp h3 .isFollowing:before display: none!important - .isFollowing:after + .isFollowing:after display: none!important - diff --git a/sass/base/_fonts.sass b/sass/base/_fonts.sass index 75e7a09..c3bbcba 100644 --- a/sass/base/_fonts.sass +++ b/sass/base/_fonts.sass @@ -55,7 +55,7 @@ font-family: "Symbola" src: url("Symbola.ttf") font-weight: 400 - font-style: normal + font-style: normal @@ -82,7 +82,7 @@ line-height: inherit -webkit-font-smoothing: antialiased -moz-osx-font-smoothing: grayscale -.ion:before +.ion:before padding: 0 3px .ion:after, .ion-after:before @@ -143,7 +143,7 @@ .ion-tox:before content: "\f200" -.ion-copy:before +.ion-copy:before content: "\f381" .ion-search:after @@ -152,8 +152,8 @@ .ion-right:after content: "\f125" -.ion-android-contacts:before - content: "\f2d9" +.ion-android-contacts:before + content: "\f2d9" .ion-arrow-shrink:before content: "\f267" diff --git a/sass/base/_utils.sass b/sass/base/_utils.sass index 43943fc..ca386a8 100644 --- a/sass/base/_utils.sass +++ b/sass/base/_utils.sass @@ -1,14 +1,14 @@ -.box-shadow +.box-shadow +box-shadow(0 8px 13px rgba(#111, 0)) .clear-fix &:after // clearfix content: "" - display: table + display: table clear: both @@ -21,13 +21,13 @@ button, a.button line-height: .75rem letter-spacing: 0.07rem font-size: .75rem - position: relative + position: relative font-weight: 300 text-transform: uppercase +transition-property(background, border-color) +transition-duration(.1s) color: $dark-grey - background: #F8F8F8 + background: #F8F8F8 border: 1px solid darken( #F8F8F8 , 5%) font-family: $symbol-font-family, $main-font-family cursor: pointer @@ -42,29 +42,29 @@ button, a.button &:hover color: #666 +box-shadow(1px 1px 0 rgba(#444, .3)) - &.color-1 + &.color-1 background: $main-color-color border-color: darken($main-color-color, 5%) color: white font-weight: 500 - &:hover + &:hover border-color: darken($main-color-color, 22%) &.color-2 background: #64676C border-color: darken(#64676C, 5%) color: white font-weight: 500 - &:hover + &:hover border-color: darken(#64676C, 15%) - &.small + &.small padding: .5rem font-weight: 700 - font-size: .7rem + font-size: .7rem line-height: .7rem - &.light + &.light background: #eee border-color: darken(#eee, 5%) color: $main-color-dark font-weight: 500 - &:hover - border-color: darken(#eee, 25%) \ No newline at end of file + &:hover + border-color: darken(#eee, 25%) diff --git a/sass/base/_var.sass b/sass/base/_var.sass index bc3875c..75eaa60 100644 --- a/sass/base/_var.sass +++ b/sass/base/_var.sass @@ -5,10 +5,10 @@ $gut : 18px $postboardWidth : 670px $miniProfileWidth : $site-width/8 -$leftWidth : $miniProfileWidth + $gut +$leftWidth : $miniProfileWidth + $gut $rightWidth : $site-width - ($leftWidth + $postboardWidth) -$postboardLargeWidth : $postboardWidth + $rightWidth +$postboardLargeWidth : $postboardWidth + $rightWidth $micro-usr-img : 36px $mini-usr-img : 48px @@ -18,10 +18,10 @@ $space : 1rem -// colors +// colors $light-grey: #C3C3C3 $color-green: #A1B775 -$color-red: #EF5D43 +$color-red: #EF5D43 $color-blue: #39434F $dark-grey : #3E3C42 @@ -31,7 +31,7 @@ $main-color-dark: #222 $main-color-color: $color-green $main-background-color: #eee $bloc-light-color : #FDFCFA -$bloc-background-color: #F3F2F0 +$bloc-background-color: #F3F2F0 @@ -47,4 +47,3 @@ $main-line-height : 1.3rem $main-font-family: "Roboto", sans-serif, "Symbola" $symbol-font-family: "Ionicons" $serif-font-family: "Droid", serif - diff --git a/sass/layout/_dm.sass b/sass/layout/_dm.sass index 0404681..2b08443 100644 --- a/sass/layout/_dm.sass +++ b/sass/layout/_dm.sass @@ -1,17 +1,17 @@ /****** DIRECT MESSAGES MODAL**********/ .modal-wrapper.directMessages - + .post-area-new display: none z-index: 5 background: $bloc-light-color !important - position: absolute + position: absolute bottom: 40px width: 100% !important padding: 10px 20px!important +box-shadow(0 -8px 13px rgba(#111, 0.1)) - #post-preview + #post-preview background: none border: none padding: 5px @@ -22,7 +22,7 @@ h3 span display: inline-block!important padding-left: 5px - color: white + color: white cursor: default .modal-content @@ -37,7 +37,7 @@ .post-info-name float: none .message.received, .message.sent - .post-info-name + .post-info-name display: none .post-info-tag line-height: 1em @@ -45,7 +45,7 @@ display: inline font-size: 80% margin: 0 0 0 1em - .post-info-sent + .post-info-sent position: absolute left: 50% top: 10px @@ -71,7 +71,7 @@ .post:hover:after opacity: 1 right: 5px - .post:hover + .post:hover background: white .post .messages-qtd @@ -79,7 +79,7 @@ top: 4px left: 56px - li + li position: relative border-bottom: 1px solid $main-background-color background: $bloc-light-color @@ -87,7 +87,7 @@ padding-bottom: 200px max-width: 420px margin: auto - li + li position: relative!important .post @@ -102,7 +102,7 @@ display: block text-align: center font-size: 10px - padding-top: 10px + padding-top: 10px margin-bottom: 10px cursor: default position: static @@ -145,7 +145,7 @@ position: absolute left: 0 top: 30px - float: none + float: none margin: 0 @@ -165,4 +165,3 @@ position: absolute right: 0 left: auto - diff --git a/sass/layout/_groupchat.sass b/sass/layout/_groupchat.sass index a9af4bb..a10fab4 100644 --- a/sass/layout/_groupchat.sass +++ b/sass/layout/_groupchat.sass @@ -2,43 +2,43 @@ .group-messages-join-group - .modal-content + .modal-content padding: 20px - button + button margin: 5px 0 - .label - font-weight: 700 + .label + font-weight: 700 padding: 5px 0 text-align: left input[type="text"] - padding: 3px + padding: 3px width: 100% margin-bottom: 10px input[type="checkbox"] - float: left + float: left margin-right: 10px -.groupMessages - button +.groupMessages + button margin: 5px .direct-messages-list - li + li padding: 10px 20px - .post-photo + .post-photo display: none - .post-text + .post-text display: none .post-info-time position: static display: block - text-align: left + text-align: left padding: 5px 0 color: inherit - &:hover + &:hover text-decoration: none color: inherit @@ -52,13 +52,13 @@ // new group .group-messages-new-group text-align: center!important - .label - font-weight: 700 + .label + font-weight: 700 padding: 5px 1% text-align: left textarea - &.description, &.invite - width: 98% + &.description, &.invite + width: 98% margin: 5px auto padding: 5px text-align: left @@ -96,18 +96,18 @@ text-align: left!important button margin: 3px 0 3px 3px - textarea - width: 98% + textarea + width: 98% margin: 5px auto padding: 5px text-align: left border: 1px solid darken( #F8F8F8 , 5%) - .invite-form + .invite-form display: none - div.profile-bio + div.profile-bio margin-left: 0 - .secret-key + .secret-key display: none font-size: 10px padding: 5px @@ -115,15 +115,15 @@ cursor: pointer border: 1px solid darken( #F8F8F8 , 5%) color: $dark-grey - background: #F8F8F8 + background: #F8F8F8 overflow: hidden - &:hover + &:hover background: white -.direct-messages-thread + .group-messages-control - position: absolute - bottom: 0 +.direct-messages-thread + .group-messages-control + position: absolute + bottom: 0 height: 40px overflow: hidden left: 0 @@ -133,14 +133,14 @@ z-index: 200 background: $bloc-light-color +box-shadow(0 -8px 13px rgba(#111, 0.1)) - .invite-form + .invite-form @extend .prompt-wrapper bottom: 40px top: auto textarea min-height: 100px - button - float: none + button + float: none display: inline-block padding: 7px @extend .color-1 diff --git a/sass/layout/_menu.sass b/sass/layout/_menu.sass index 00d443a..81af200 100644 --- a/sass/layout/_menu.sass +++ b/sass/layout/_menu.sass @@ -19,7 +19,7 @@ $menuBgColor : $dark-grey max-width: 100% width: $site-width margin: auto - background: image-url("logo.png") no-repeat 50% 50% + background: image-url("logo.png") no-repeat 50% 50% background-size: 20px li position: relative @@ -27,7 +27,7 @@ $menuBgColor : $dark-grey float: left margin: 0 10px > a - line-height: $menu-height + line-height: $menu-height display: inline-block color: rgba($menu-font-color, 0.5)!important font-size: 1rem @@ -36,24 +36,24 @@ $menuBgColor : $dark-grey &:hover color: $menu-font-color!important text-decoration: none - + &:before padding-right: 5px - span - display: inline-block + span + display: inline-block &.current a color: $menu-font-color!important -/* Menu specific entries */ +/* Menu specific entries */ .userMenu li - &.userMenu-home - a - .label + &.userMenu-home + a + .label display: inline-block!important .menu-news @@ -63,7 +63,7 @@ $menuBgColor : $dark-grey top: 5px right: -12px background: $main-color-color - width: 15px + width: 15px height: 15px line-height: 15px font-size: 10px @@ -73,7 +73,7 @@ $menuBgColor : $dark-grey +border-radius(50%) +box-sizing(content-box) color: white - &.show + &.show display: block @@ -83,10 +83,10 @@ $menuBgColor : $dark-grey &.userMenu-config, &.userMenu-search float: right color: $menu-font-color - + a - color: $main-color-dark + + a + color: $main-color-dark &.userMenu-search - > input + > input border: 1px solid rgba(white,.3) line-height: $menu-height/2 margin-top: $menu-height/4 @@ -95,7 +95,7 @@ $menuBgColor : $dark-grey background: rgba(white,.1) color: white +border-radius(7px) - &:focus + &:focus border-color: rgba(white,.7) &.userMenu-config > a @extend .ion @@ -105,10 +105,10 @@ $menuBgColor : $dark-grey a background: $bloc-light-color border-top: 1px solid $main-background-color - &:hover + &:hover background: white text-decoration: none - display: block + display: block width: 100% font-weight: 400 line-height: $mini-usr-img / 1.5 diff --git a/sass/layout/_modal.sass b/sass/layout/_modal.sass index 998bb54..60445b6 100644 --- a/sass/layout/_modal.sass +++ b/sass/layout/_modal.sass @@ -25,7 +25,7 @@ $header-modal-height : $menu-height +box-shadow(-8px 0 13px rgba(#111, 0.2)) +transition-property(top, bottom) +transition-duration(1s) - &.remove + &.remove bottom: 300% // NEW USER MODAL // @@ -51,14 +51,14 @@ $header-modal-height : $menu-height &.following-modal - h2 + h2 display: none .mini-following-info border-bottom: 1px solid $main-background-color line-height: $mini-usr-img - a - display: block + a + display: block padding: 10px width: 100% @@ -66,9 +66,9 @@ $header-modal-height : $menu-height color: $defaut-font-color background: $bloc-light-color - &:hover + &:hover background: white - text-decoration: none + text-decoration: none font-weight: 500 .mini-profile-photo width: $mini-usr-img @@ -77,20 +77,20 @@ $header-modal-height : $menu-height line-height: 0 margin: 0 $space 0 0 float: left - .mini-following-name - &:after + .mini-following-name + &:after line-height: 20px - .mini-screen-name + .mini-screen-name display: none - + &.who-to-follow-modal - a + a color: $main-color-dark - &.twister-user-name - &:hover + &.twister-user-name + &:hover text-decoration: none .twister-user-info text-align: left @@ -98,11 +98,11 @@ $header-modal-height : $menu-height line-height: 1rem width: 80% padding-left: $mini-usr-img + 20 - button - position: absolute + button + position: absolute right: 10px top: 10px - @extend .small + @extend .small .bio color: rgba(0, 0, 0, 0.6) font-style: italic @@ -122,10 +122,10 @@ $header-modal-height : $menu-height width: 100% margin: auto - h2 + h2 display: block - span - display: none + span + display: none .postboard-news @@ -135,8 +135,8 @@ $header-modal-height : $menu-height top: $header-modal-height +2 z-index: 2000 @extend .color-1 - - + + &.new-users-modal a color: $main-color-dark @@ -163,21 +163,21 @@ $header-modal-height : $menu-height .modal-header position: relative background: darken($main-color-dark,.3) - height: $header-modal-height + height: $header-modal-height +box-sizing(border-box) @extend .clear-fix h3 padding-left: 20px line-height: $header-modal-height - font-weight: 500 + font-weight: 500 font-size: 1rem float: left color: white - span + span position: relative - span - + span + @extend .ion position: absolute top: 0 @@ -197,7 +197,7 @@ $header-modal-height : $menu-height right: 10px &.mark-all-as-read @extend .ion-checkmark - position: static + position: static float: left margin-left: 10px display: none @@ -236,21 +236,21 @@ $header-modal-height : $menu-height border-bottom: 1px solid $main-background-color width: 100% min-height: auto - padding: 7px + padding: 7px clear: left - &:first-child + &:first-child border-top: 1px solid $main-background-color border-bottom: 1px solid $main-background-color !important - &:last-child + &:last-child border-bottom: 0 - small + small display: none /* Minimized */ -.minimize-modal +.minimize-modal @extend .ion @extend .ion-minus position: absolute @@ -269,15 +269,15 @@ $header-modal-height : $menu-height -#modals-minimized - position: fixed +#modals-minimized + position: fixed z-index: 2000 - left: 0 - bottom: 0 + left: 0 + bottom: 0 width: $leftWidth text-align: right li - background: $dark-grey + background: $dark-grey cursor: pointer margin-right: 10px font-weight: 600 @@ -286,16 +286,14 @@ $header-modal-height : $menu-height margin-bottom: 10px color: rgba(white, .8) +transition(margin .2s) - &:hover - color: white + &:hover + color: white margin-right: 0 /*********** POPUP PROMPT *************/ @import '_prompt' -/********* DIRECT MESSAGES MODAL ***********/ +/********* DIRECT MESSAGES MODAL ***********/ @import '_dm' - - diff --git a/sass/layout/_postboard.sass b/sass/layout/_postboard.sass index 9fc65f0..d8692ea 100755 --- a/sass/layout/_postboard.sass +++ b/sass/layout/_postboard.sass @@ -1,6 +1,6 @@ /************* TOP TEXTAREA *************/ #postboard-top - position: relative + position: relative @extend .clear-fix margin-bottom: 10px transition: height .3s linear @@ -10,7 +10,7 @@ background: $bloc-light-color +transition-property( top) +transition-duration(.1s) - +transition-timing-function(ease-out) + +transition-timing-function(ease-out) top: 0 +box-shadow(1px 2px 2px rgba(#111, 0.1)) z-index: 120 @@ -38,19 +38,19 @@ textarea margin: 0 0 10px 0 - &.onTop + &.onTop position: fixed bottom: 0 - left: 0 + left: 0 top: auto margin-bottom: 0 z-index: 2000 +box-shadow(0 -5px 13px rgba(#111, 0.2)) width: 320px max-width: 100% - .profile-photo + .profile-photo display: none!important - .post-area + .post-area padding-left: 0 @@ -62,7 +62,7 @@ width: $postboardWidth float: left - h2, .postboard-news + h2, .postboard-news display: none &.large @@ -75,7 +75,7 @@ .post - + position: relative margin-bottom: 1px +transition-property(margin) @@ -84,7 +84,7 @@ color: $defaut-font-color cursor: pointer - &:hover + &:hover color: #000 .show-more @@ -104,9 +104,9 @@ left: 10px bottom: 10px &:hover - color: lighten($dark-grey,5%) + color: lighten($dark-grey,5%) .post-data - padding: 15px + padding: 15px background: $bloc-light-color @@ -121,14 +121,14 @@ margin-top: $space margin-bottom: $space +box-shadow(1px 2px 2px rgba(#111, 0)) - .post + .post color: darken($defaut-font-color, 15%) +box-shadow(1px 2px 2px rgba(#111, 0.1)) margin-bottom: 1px &:not(.original) .post-expand display: none - margin: 0 + margin: 0 .post-photo margin: 0 @@ -163,8 +163,8 @@ .post-info-sent display: block - position: absolute - top: -10px + position: absolute + top: -10px right: 0 font-size: 15px @@ -187,7 +187,7 @@ word-wrap: break-word min-height: $mini-usr-img - 20 padding: 0 - a:hover + a:hover text-decoration: underline @@ -237,12 +237,12 @@ position: relative margin-left: 7px display: none - .open .original & + .open .original & display: inline-block!important &:hover color: lighten($dark-grey,5%) - &:before + &:before padding: 3px &.post-reply @extend .ion-plus @@ -252,17 +252,17 @@ @extend .ion-alert .post:hover & - .post-reply, .post-propagate , .post-favorite + .post-reply, .post-propagate , .post-favorite display: inline-block .open .related - .post-reply, - .post-propagate, + .post-reply, + .post-propagate, .post-favorite display: none!important &:hover - .post-reply, + .post-reply, .post-propagate, .post-favorite display: inline-block!important @@ -272,7 +272,7 @@ //display: none padding: 0 @extend .clear-fix - textarea + textarea clear: left .image-preview @@ -299,9 +299,9 @@ line-height: 20px @extend .ion-shuffle @extend .ion - &:before + &:before margin-right: 0 - span:last-child + span:last-child display: none a @@ -324,8 +324,8 @@ .avatar-row margin-left: 5px - a:hover - .user-name-tooltip + a:hover + .user-name-tooltip display: block .user-name-tooltip @@ -375,7 +375,7 @@ margin: 5px 0 0 0 clear: both font-size: 12px - line-height: 130% + line-height: 130% .post-info-time font-size: 80% .post-area diff --git a/sass/layout/_profile.sass b/sass/layout/_profile.sass index 2f56bd3..d82c268 100644 --- a/sass/layout/_profile.sass +++ b/sass/layout/_profile.sass @@ -36,7 +36,7 @@ $modal-postboard-post-height: 100% margin: 0 padding: 0 border-bottom: 1px solid $main-background-color - .profile-data + .profile-data background: none .members @@ -65,10 +65,10 @@ $modal-postboard-post-height: 100% text-align: left word-wrap: break-word background: none!important - padding: 10px - h1, h2 + padding: 10px + h1, h2 display: inline !important - b + b font-weight: 400 &:before content: "" @@ -98,7 +98,7 @@ $modal-postboard-post-height: 100% font-size: .9rem margin-left: $usr-img + 10 -.profile-card-buttons +.profile-card-buttons text-align: center padding: 0 0 $space 0 @@ -136,13 +136,13 @@ $modal-postboard-post-height: 100% .bitmessage-ctc, .tox-ctc background: #999 - color: white + color: white font-size: 1rem display: inline-block padding: 10px line-height: 1rem @extend .ion-copy - @extend .ion + @extend .ion @@ -155,5 +155,4 @@ $modal-postboard-post-height: 100% color: $main-color-color text-decoration: none @extend .ion-tox - @extend .ion - + @extend .ion diff --git a/sass/layout/_prompt.sass b/sass/layout/_prompt.sass index c07b51a..34cc7bb 100644 --- a/sass/layout/_prompt.sass +++ b/sass/layout/_prompt.sass @@ -14,20 +14,20 @@ float: right .modal-content padding: 20px - .post-area - textarea + .post-area + textarea clear: both .post-data border: 1px solid $bloc-background-color position: relative - padding: 10px + padding: 10px background: white .modal-header - @extend .modal-header - h3 span - padding-left: 5px - color: white - &:hover + @extend .modal-header + h3 span + padding-left: 5px + color: white + &:hover cursor: default .modal-buttons margin: 4px 0 @@ -55,7 +55,7 @@ h2 text-transform: none display: inline-block!important - font-size: 1rem + font-size: 1rem font-weight: 400 padding: $space span @@ -73,7 +73,7 @@ .post-expand, .post-interactions display: none - .post-info-time + .post-info-time position: static float: right diff --git a/sass/layout/_responsive.sass b/sass/layout/_responsive.sass index a35b88a..3a744f1 100644 --- a/sass/layout/_responsive.sass +++ b/sass/layout/_responsive.sass @@ -1,13 +1,13 @@ @media (max-width: $site-width) - .right - display: none - .userMenu - ul + .right + display: none + .userMenu + ul padding: 0 .postboard position: absolute - left: $leftWidth + left: $leftWidth right: 20px width: auto!important @@ -17,7 +17,7 @@ .postboard width: $postboardWidth float: left - position: relative + position: relative left: 0 @media (max-width: 700px) @@ -30,8 +30,8 @@ margin: 0 !important float: none - .userMenu - > ul + .userMenu + > ul background-image: none @@ -50,13 +50,13 @@ min-height: $menu-height + 70px width: 100% > .module - top: $menu-height + top: $menu-height float: none width: 100% position: fixed z-index: 10 - .mini-profile-info + .mini-profile-info display: none .mini-profile-indicators li width: 20% @@ -66,24 +66,24 @@ &.userMenu-user, &.userMenu-collapsePosts display: none - .who-follow + .who-follow display: none - .promoted-posts-only + .promoted-posts-only display: none - .wrapper + .wrapper padding-top: 0 - .postboard + .postboard width: 100% - float: none + float: none left: 0 z-index: 5 top: 0 position: relative margin-top: 0 - .modal-wrapper & + .modal-wrapper & top: auto - #postboard-top + #postboard-top display: none .modal-wrapper width: 90% @@ -98,6 +98,6 @@ .userMenu li.userMenu-search > input width: 100px - .dialog-modal + .dialog-modal right: -50px - width: 290px \ No newline at end of file + width: 290px diff --git a/sass/layout/_wrapper.sass b/sass/layout/_wrapper.sass index a1f3744..afb8275 100644 --- a/sass/layout/_wrapper.sass +++ b/sass/layout/_wrapper.sass @@ -9,22 +9,22 @@ @extend .clear-fix .dashboard &.left - top: $menu-height + top: $menu-height float: left - width: $leftWidth + width: $leftWidth min-height: 700px > .module width: $miniProfileWidth position: fixed top: $menu-height + $gut z-index: 2000 - - &.right + + &.right float: left - top: $menu-height + top: $menu-height overflow: hidden width: $rightWidth - padding-left: $gut + padding-left: $gut padding-right: 3px > .module width: 100% @@ -39,10 +39,10 @@ h3 float: left padding: 10px - h4 + h4 clear: left padding: 10px 10px 5px 10px - font-size: 90% + font-size: 90% small display: none ol diff --git a/sass/pages/_following.sass b/sass/pages/_following.sass index 84f105d..1adcc49 100644 --- a/sass/pages/_following.sass +++ b/sass/pages/_following.sass @@ -1,8 +1,8 @@ -.following +.following width: $postboardWidth float: left - h2 + h2 display: none .following-list li border-bottom: 1px solid $main-background-color @@ -11,11 +11,11 @@ position: relative +transition-property(background) +transition-duration(.1s) - &:hover + &:hover background: white - a - display: block + a + display: block padding: $space width: 100% @extend .clear-fix @@ -27,22 +27,22 @@ line-height: 0 margin: 0 $space 0 0 float: left - .mini-profile-name - font-size: 1rem + .mini-profile-name + font-size: 1rem font-weight: 500 float: left - display: block - line-height: 1rem + display: block + line-height: 1rem padding: 10px 0 - .mini-screen-name + .mini-screen-name display: block - float: left - line-height: 1rem + float: left + line-height: 1rem font-weight: 400 font-size: 1rem - padding: 10px + padding: 10px color: #666 - b + b font-weight: 400 padding: 0 color: inherit @@ -58,4 +58,3 @@ .swarm-status display: none!important - diff --git a/sass/pages/_login.sass b/sass/pages/_login.sass index 7eda2f6..daf2680 100644 --- a/sass/pages/_login.sass +++ b/sass/pages/_login.sass @@ -1,21 +1,21 @@ .login - h2 - font-weight: 400 + h2 + font-weight: 400 +background-image(linear-gradient(to left , $color-green, #5E80A2) ) padding: 1rem 2rem color: white - h3 + h3 font-weight: 600 margin-top: 2*$space padding: 0 1.5rem +box-sizing(content-box) - &:after - display: block + &:after + display: block content: '' - height: 1px + height: 1px width: 100% background: rgba(#5F81A1,.5) margin-top: $space @@ -25,13 +25,13 @@ background: $bloc-light-color +box-shadow(1px 2px 2px rgba(#111, 0.1)) @extend .clear-fix - + padding: 20px - margin-bottom: 1px - clear: none + margin-bottom: 1px + clear: none p margin-bottom: 5px - span + span @extend h3 margin-bottom: 20px display: block @@ -65,7 +65,6 @@ margin-left: 10px color: #45474d - .create-user - clear: both + .create-user + clear: both margin: 20px 0 - diff --git a/sass/pages/_network.sass b/sass/pages/_network.sass index e652282..b427589 100644 --- a/sass/pages/_network.sass +++ b/sass/pages/_network.sass @@ -18,11 +18,11 @@ float: left margin-right: 1% @extend .clear-fix - &:last-child + &:last-child margin-right: 0 - &:last-child - h2 + &:last-child + h2 +background-image(linear-gradient(to right , $color-green, #5E80A2) ) @@ -46,7 +46,7 @@ span.connection-status font-weight: 500 - &:before + &:before content: "" display: inline-block height: .8em @@ -65,23 +65,22 @@ font-weight: 700 font-family: Arial font-size: 95% - h2 - font-weight: 400 + h2 + font-weight: 400 +background-image(linear-gradient(to left , $color-green, #5E80A2) ) padding: 1rem 2rem color: white - h3 + h3 font-weight: 600 margin-top: 2*$space padding: 0 1.5rem +box-sizing(content-box) - &:after - display: block + &:after + display: block content: '' - height: 1px + height: 1px width: 100% background: rgba(#5F81A1,.5) margin-top: $space - diff --git a/sass/pages/_profile.sass b/sass/pages/_profile.sass index 3e0fef8..5c739a7 100644 --- a/sass/pages/_profile.sass +++ b/sass/pages/_profile.sass @@ -2,7 +2,7 @@ .forEdition.profile-card - padding: 0 + padding: 0 background: none background: $bloc-light-color +box-shadow(1px 2px 2px rgba(#111, 0.1)) @@ -11,52 +11,52 @@ .profile-card-main @extend .clear-fix - + padding: 20px margin: 0 0 1px 0 input display: block - margin: 0 0 10px 100px - width: 600px + margin: 0 0 10px 100px + width: 600px background: $bloc-background-color border: 1px solid $bloc-light-color padding: 6px 4px margin-bottom: 4px - font-size: 1rem + font-size: 1rem font-weight: 400 &:hover, &:focus background: white border-color: $main-color-light - img - width: 70px + img + width: 70px float: left - h2 - font-weight: 400 + h2 + font-weight: 400 +background-image(linear-gradient(to left , $color-green, #5E80A2) ) padding: 1rem 2rem color: white - h3 + h3 font-weight: 600 margin-top: 2*$space padding: 0 1.5rem +box-sizing(content-box) - &:after - display: block + &:after + display: block content: '' - height: 1px + height: 1px width: 100% background: rgba(#5F81A1,.5) margin-top: $space button - float: right - margin: 10px - &.last-child + float: right + margin: 10px + &.last-child margin-right: 0 &.submit-changes @extend button.color-1 @@ -68,12 +68,12 @@ clear: both padding: 10px - - .label - clear: both + + .label + clear: both display: block float: left font-weight: 700 margin-right: 20px - .secret-key + .secret-key @extend samp diff --git a/sass/style.sass b/sass/style.sass index 01a6566..65a207e 100755 --- a/sass/style.sass +++ b/sass/style.sass @@ -32,30 +32,30 @@ .promoted-posts-only margin: 0 0 - + li cursor: pointer display: block margin: 0 width: 50% - padding: .5rem + padding: .5rem float: left text-align: center transition: color .1s linear position: relative border-left: 1px solid $main-background-color - span + span font-size: .8rem line-height: .8rem display: block - &.disabled + &.disabled background: $bloc-background-color color: rgba($defaut-font-color, .3) z-index: 3 &.active color: $defaut-font-color cursor: default - + z-index: 5 @@ -82,13 +82,13 @@ display: block padding: 10px - + ul.userMenu-search-profiles width: 100% padding: 0 - - + + li float: none display: block @@ -97,11 +97,11 @@ ul.userMenu-search-profiles cursor: pointer background: $bloc-light-color border-bottom: 1px solid $main-background-color - &:hover + &:hover background: white a - display: block + display: block width: 100% font-size: 12px font-weight: 400 @@ -116,10 +116,10 @@ ul.userMenu-search-profiles font-weight: 400 font-size: 12px - .mini-screen-name b, + .mini-screen-name b, .mini-screen-name font-weight: 500 - .mini-profile-photo + .mini-profile-photo width: $mini-usr-img / 1.5 height: auto height: $mini-usr-img / 1.5 @@ -130,7 +130,7 @@ ul.userMenu-search-profiles .mini-profile-info width: 100% float: none - .mini-profile-name + .mini-profile-name padding: 5px 0 0 0 button @@ -142,7 +142,7 @@ ul.userMenu-search-profiles font-weight: 700 padding: 0 position: absolute - top: 5px + top: 5px right: 5px @@ -164,8 +164,8 @@ ul.userMenu-search-profiles .mini-profile - a:hover - text-decoration: none + a:hover + text-decoration: none a.button background: $main-color-light @@ -173,11 +173,11 @@ ul.userMenu-search-profiles .post-area margin-top: 1px margin-bottom: 20px - + @extend .clear-fix - .modal-header - @extend .modal-header - h3 + .modal-header + @extend .modal-header + h3 padding: 0 0 0 20px .post-area-new @extend .open @@ -188,7 +188,7 @@ ul.userMenu-search-profiles width: 100% .mini-profile-indicators - margin: 0 + margin: 0 text-align: center @extend .clear-fix border-top: 1px solid $main-background-color @@ -209,7 +209,7 @@ ul.userMenu-search-profiles &:hover color: $dark-grey background: $bloc-light-color - &:before + &:before display: block!important width: 100%!important font-size: 1.4rem!important @@ -224,10 +224,10 @@ ul.userMenu-search-profiles @extend .ion-profile @extend .ion .userMenu-groupmessages a - @extend .ion-android-contacts + @extend .ion-android-contacts @extend .ion .userMenu-collapsePosts a - @extend .ion + @extend .ion @extend .ion-arrow-shrink .messages-qtd position: absolute @@ -237,7 +237,7 @@ ul.userMenu-search-profiles text-align: center +text-shadow(1px 1px 0 rgba(#000,.2)) color: #fff - width: 25px + width: 25px height: 25px line-height: 25px font-size: 10px @@ -295,7 +295,7 @@ ul.userMenu-search-profiles .mini-profile a span.following-count - display: block + display: block font-weight: 900 font-size: 1.2rem color: lighten($dark-grey,20%) @@ -319,7 +319,7 @@ ul.userMenu-search-profiles .show-more-followers - @extend button + @extend button @extend .small float: right margin-right: 5px @@ -346,7 +346,7 @@ ul.userMenu-search-profiles /***************** POST AREA ***************/ .post-area-new - + textarea resize: none +box-sizing(border-box) @@ -368,15 +368,15 @@ ul.userMenu-search-profiles .mini-profile .post-area display: none - &.display + &.display display: block @extend .prompt-wrapper margin-top: -110px -#post-preview - border: 1px solid $main-background-color +#post-preview + border: 1px solid $main-background-color border-bottom: 0 padding: 5px +transition-property(all) @@ -439,15 +439,15 @@ textarea.splited-post .who-to-follow &.module - li - button - position: absolute + li + button + position: absolute right: 30px top: 10px @extend .small - display: none + display: none padding: .4rem!important - &:hover button + &:hover button display: block @@ -519,7 +519,7 @@ img.twister-user-photo letter-spacing: 0 float: right display: block - margin: 10px + margin: 10px position: relative .view-all-users @@ -531,7 +531,7 @@ img.twister-user-photo letter-spacing: 0 float: right display: block - margin: 10px + margin: 10px position: relative @extend .ion-eye @extend .ion @@ -567,16 +567,16 @@ img.twister-user-photo /********* TWISTDAY REMINDER *******/ .twistday-reminder - + .twister-user-full, .twister-user-tag - font-size: .9rem - line-height: 1rem + font-size: .9rem + line-height: 1rem color: $defaut-font-color font-weight: 500 - opacity: 1 + opacity: 1 display: inline-block - .twisterday + .twisterday font-size: 12px /*********** NEWCOMERS ************/ @@ -607,74 +607,74 @@ img.twister-user-photo margin: 100px auto display: none - div + div width: .1em height: .1em position: absolute border-radius: 50% - &:nth-child(1) + &:nth-child(1) background: #62839F top: 0 left: 50% - margin-left: -.05em + margin-left: -.05em transform-origin: 50% 250% animation: rota 1.13s linear infinite, opa 3.67s ease-in-out infinite alternate - &:nth-child(2) + &:nth-child(2) background: #749294 - top: 50% + top: 50% right: 0 - margin-top: -.05em + margin-top: -.05em transform-origin: -150% 50% animation: rota 1.86s linear infinite, opa 4.29s ease-in-out infinite alternate - &:nth-child(3) + &:nth-child(3) background: #94AC7E bottom: 0 - left: 50% - margin-left: -.05em + left: 50% + margin-left: -.05em transform-origin: 50% -150% animation: rota 1.45s linear infinite, opa 5.12s ease-in-out infinite alternate - &:nth-child(4) + &:nth-child(4) background: #B4C669 - top: 50% + top: 50% left: 0 - margin-top: -.05em + margin-top: -.05em transform-origin: 250% 50% animation: rota 1.72s linear infinite, opa 5.25s ease-in-out infinite alternate -@keyframes rota +@keyframes rota to transform: rotate(360deg) -@keyframes opa - 12.0% +@keyframes opa + 12.0% opacity: 0.80 - 19.5% + 19.5% opacity: 0.88 - 37.2% + 37.2% opacity: 0.64 - 40.5% + 40.5% opacity: 0.52 - 52.7% + 52.7% opacity: 0.69 - 60.2% + 60.2% opacity: 0.60 - 66.6% + 66.6% opacity: 0.52 - 70.0% + 70.0% opacity: 0.63 - 79.9% + 79.9% opacity: 0.60 - 84.2% + 84.2% opacity: 0.75 - 91.0% + 91.0% opacity: 0.87