diff options
author | sualko <klaus@jsxc.org> | 2018-05-16 14:54:15 +0300 |
---|---|---|
committer | sualko <klaus@jsxc.org> | 2018-05-16 14:54:15 +0300 |
commit | 91d1b828ee38961785ddfccbe6d8322621804ebb (patch) | |
tree | 5c935338d2d78aa9a63cc7aad6003793c7d7ca36 /scss | |
parent | 596a223f7ed47d2f8742b18370ab9556934f9714 (diff) |
beautify all js and scss files
Diffstat (limited to 'scss')
-rw-r--r-- | scss/_oc.scss | 378 | ||||
-rw-r--r-- | scss/jsxc.oc.scss | 24 |
2 files changed, 205 insertions, 197 deletions
diff --git a/scss/_oc.scss b/scss/_oc.scss index 4e3fb28..c2587fc 100644 --- a/scss/_oc.scss +++ b/scss/_oc.scss @@ -1,280 +1,288 @@ @keyframes jsxc-left-to-right { - 0% {background-position-x: 0%} - 50% {background-position-x: 100%} - 100% {background-position-x: 0%} + 0% { + background-position-x: 0%; + } + + 50% { + background-position-x: 100%; + } + + 100% { + background-position-x: 0%; + } } #jsxc_roster { - top: 45px; - z-index: 1500; + top: 45px; + z-index: 1500; } #jsxc_toggleRoster { - width: 8px; + width: 8px; } #jsxc_windowList, #jsxc_windowListSB { - z-index: 1500; + z-index: 1500; } #jsxc { - padding: 20px; + padding: 20px; - h1 { - margin: 15px 0 5px; - font-size: 1.5em; - } + h1 { + margin: 15px 0 5px; + font-size: 1.5em; + } - a { - color: blue; - text-decoration: underline; + a { + color: blue; + text-decoration: underline; - &:hover { - text-decoration: none; + &:hover { + text-decoration: none; + } } - } } #jsxc_submit { - font-size: 15px; - padding: 3px 5px; - opacity: 1; - font-weight: normal; + font-size: 15px; + padding: 3px 5px; + opacity: 1; + font-weight: normal; - &:hover { - opacity: 0.7; - } + &:hover { + opacity: 0.7; + } } #ojsxc { - .form-group { - overflow: hidden; + .form-group { + overflow: hidden; - > label, > .form-col { - float: left; + > label, > .form-col { + float: left; + } } - } - label { - box-sizing: border-box; - padding: 6px 15px 6px 0; - width: 100%; - margin: 3px 0; + label { + box-sizing: border-box; + padding: 6px 15px 6px 0; + width: 100%; + margin: 3px 0; - @media (min-width: 768px) { - width: 33%; - text-align: right; + @media (min-width: 768px) { + width: 33%; + text-align: right; + } } - } - .form-no-padding { - padding: 0; - } + .form-no-padding { + padding: 0; + } - .form-col { - width: 100%; - overflow: hidden; + .form-col { + width: 100%; + overflow: hidden; - @media (min-width: 768px) { - width: 66%; - } + @media (min-width: 768px) { + width: 66%; + } - input { - display: block; + input { + display: block; + } } - } - .form-col-offset { - @media (min-width: 768px) { - padding-left: 33%; - } - } - - input { - box-sizing: border-box; - padding-right: 15px; - width: 100%; - - &[type='checkbox'] { - margin: 13px 0; - width: auto; - min-height: auto; - height: auto; + .form-col-offset { + @media (min-width: 768px) { + padding-left: 33%; + } } - &[type='radio'] { - width: auto; - min-height: auto; - height: auto; + input { + box-sizing: border-box; + padding-right: 15px; + width: 100%; + + &[type='checkbox'] { + margin: 13px 0; + width: auto; + min-height: auto; + height: auto; + } + + &[type='radio'] { + width: auto; + min-height: auto; + height: auto; + } + + &[readonly] { + background-color: #f1f1f1; + } + + &:invalid { + border: 1px solid red; + position: relative; + } + + &.jsxc-loading { + background-image: linear-gradient(to right, #fff, #fff); + background-position-x: 10%; + background-size: 30px 100%; + background-repeat: no-repeat; + animation: jsxc-left-to-right 5s linear infinite; + } } - &[readonly] { - background-color: #f1f1f1; + em, .boshUrl-msg { + display: block; + clear: left; + margin-bottom: 0.8em; } - &:invalid { - border: 1px solid red; - position: relative; + .text-left { + text-align: left; } - &.jsxc-loading { - background-image: linear-gradient(to right, #fff, #fff); - background-position-x: 10%; - background-size: 30px 100%; - background-repeat: no-repeat; - animation: jsxc-left-to-right 5s linear infinite; - } - } - - em, .boshUrl-msg { - display: block; - clear: left; - margin-bottom: 0.8em; - } - - .text-left { - text-align: left; - } - - h3 { - width: 100%; - - @media (min-width: 768px) { - width: 33%; - border-bottom: 1px solid #e1e1e1; + h3 { + width: 100%; + + @media (min-width: 768px) { + width: 33%; + border-bottom: 1px solid #e1e1e1; + } } - } - .text { - margin-bottom: 10px; - } + .text { + margin-bottom: 10px; + } } %msg { - border: 1px solid #fff; - color: #030; - padding: 11px; - padding-left: 38px; - background-position: 12px center; - background-repeat: no-repeat; - background-color: #f1f1f1; - margin: 3px; + border: 1px solid #fff; + color: #030; + padding: 11px; + padding-left: 38px; + background-position: 12px center; + background-repeat: no-repeat; + background-color: #f1f1f1; + margin: 3px; } .jsxc_success { - @extend %msg; + @extend %msg; - background-image: url("../img/checkmark-green.svg"); + background-image: url("../img/checkmark-green.svg"); } .jsxc_fail { - @extend %msg; + @extend %msg; - background-image: url("../img/cross-red.svg"); - background-position: 12px 5px; + background-image: url("../img/cross-red.svg"); + background-position: 12px 5px; } .jsxc_log { - width: 500px; + width: 500px; } #mainContainer, #odf-toolbar { - right: 0; - left: 0; - width: auto !important; - z-index: 70 !important; + right: 0; + left: 0; + width: auto !important; + z-index: 70 !important; } #header .jsxc_chatIcon { - width: 45px; - height: 45px; - float: right; - background-image: url("../img/chat-icon-white.svg"); - background-size: 20px; - background-repeat: no-repeat; - background-position: center; - opacity: 0.7; - cursor: pointer; - - &:hover { - opacity: 1; - } -} - -@media (min-width: 768px) { - #content-wrapper, #filestable > thead, #controls { - padding-right: 0; - transition: padding-right 0.5s; - } - - #mainContainer, #odf-toolbar, #app-sidebar { - right: 0; - transition: right 0.5s; - } - - .app-mail .submit-message-wrapper { - transition: right 0.5s; + width: 45px; + height: 45px; + float: right; + background-image: url("../img/chat-icon-white.svg"); + background-size: 20px; + background-repeat: no-repeat; + background-position: center; + opacity: 0.7; + cursor: pointer; - .submit-message { - transition: right 0.5s; + &:hover { + opacity: 1; } - } +} - .jsxc-roster-shown { +@media (min-width: 768px) { #content-wrapper, #filestable > thead, #controls { - padding-right: 210px; + padding-right: 0; + transition: padding-right 0.5s; } #mainContainer, #odf-toolbar, #app-sidebar { - right: 210px; + right: 0; + transition: right 0.5s; } .app-mail .submit-message-wrapper { - right: 225px; + transition: right 0.5s; - .submit-message { - right: 225px; - } + .submit-message { + transition: right 0.5s; + } } - #app-content.with-app-sidebar { - padding-right: 50px; + .jsxc-roster-shown { + #content-wrapper, #filestable > thead, #controls { + padding-right: 210px; + } + + #mainContainer, #odf-toolbar, #app-sidebar { + right: 210px; + } + + .app-mail .submit-message-wrapper { + right: 225px; + + .submit-message { + right: 225px; + } + } + + #app-content.with-app-sidebar { + padding-right: 50px; + } } - } } #body-login { - #jsxc_windowList, #jsxc_roster { - display: none; - } + #jsxc_windowList, #jsxc_roster { + display: none; + } } #contactsmenu-contacts { - .jsxc_statusIndicator { - position: relative; - - &:before { - width: 6px; - height: 6px; - right: 13px; - top: 13px; - position: absolute; - } + .jsxc_statusIndicator { + position: relative; + + &:before { + width: 6px; + height: 6px; + right: 13px; + top: 13px; + position: absolute; + } } - .contact { - &:before { + .contact { + &:before { position: absolute; top: 7px; left: 7px; - } + } - .avatar { - cursor: pointer; - } - } + .avatar { + cursor: pointer; + } + } } .nav-icon-javascript-xmpp-client { - background-image: url("../img/app-black.svg"); + background-image: url("../img/app-black.svg"); } diff --git a/scss/jsxc.oc.scss b/scss/jsxc.oc.scss index c26767a..c61c0cc 100644 --- a/scss/jsxc.oc.scss +++ b/scss/jsxc.oc.scss @@ -1,5 +1,5 @@ -@import 'js/jsxc/scss/colors'; -@import 'js/jsxc/scss/dep'; +@import "js/jsxc/scss/colors"; +@import "js/jsxc/scss/dep"; //fonts $font_sans: Arial, sans-serif; @@ -9,15 +9,15 @@ $window_bar_bg: #0082c9; $window_bar_color: #c0dff1; $window_bar_color_hover: #fff; -@import 'js/jsxc/scss/modules', - 'js/jsxc/scss/buddylist', - 'js/jsxc/scss/state', - 'js/jsxc/scss/emoticons', - 'js/jsxc/scss/roster', - 'js/jsxc/scss/window', - 'js/jsxc/scss/muc'; +@import "js/jsxc/scss/modules"; +@import "js/jsxc/scss/buddylist"; +@import "js/jsxc/scss/state"; +@import "js/jsxc/scss/emoticons"; +@import "js/jsxc/scss/roster"; +@import "js/jsxc/scss/window"; +@import "js/jsxc/scss/muc"; -@import 'js/jsxc/scss/_jsxc.scss'; -@import 'js/jsxc/scss/webrtc'; +@import "js/jsxc/scss/_jsxc.scss"; +@import "js/jsxc/scss/webrtc"; -@import '_oc'; +@import "_oc"; |