Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/jsxc.nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsualko <klaus@jsxc.org>2017-01-23 16:23:45 +0300
committersualko <klaus@jsxc.org>2017-01-23 16:23:45 +0300
commit859c5b3adbf27ea3e2f4d25e5409bb2929f2c5d4 (patch)
tree45fa7e8a1d5faa090e0779faa89d276d160f0b2a
parent9d1d4a926340d22dcbcad6a78ebf4c830591243a (diff)
lint scss
-rw-r--r--.scss-lint.yml41
-rw-r--r--scss/_oc.scss234
2 files changed, 167 insertions, 108 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml
new file mode 100644
index 0000000..6ed27a0
--- /dev/null
+++ b/.scss-lint.yml
@@ -0,0 +1,41 @@
+scss_files: 'scss/*.scss'
+
+linters:
+ ChainedClasses:
+ enabled: false
+ ColorKeyword:
+ enabled: false
+ ColorVariable:
+ enabled: false
+ EmptyRule:
+ enabled: false
+ HexNotation:
+ enabled: false
+ IdSelector:
+ enabled: false
+ ImportPath:
+ enabled: false
+ ImportantRule:
+ enabled: false
+ Indentation:
+ width: 2
+ LeadingZero:
+ style: include_zero
+ NameFormat:
+ enabled: false
+ NestingDepth:
+ enabled: false
+ PropertySortOrder:
+ enabled: false
+ PseudoElement:
+ enabled: false
+ QualifyingElement:
+ enabled: false
+ SelectorDepth:
+ enabled: false
+ SelectorFormat:
+ enabled: false
+ SingleLinePerSelector:
+ enabled: false
+ StringQuotes:
+ style: double_quotes
diff --git a/scss/_oc.scss b/scss/_oc.scss
index ab5ac12..343f01a 100644
--- a/scss/_oc.scss
+++ b/scss/_oc.scss
@@ -1,142 +1,160 @@
#jsxc_roster {
- top: 45px;
- z-index: 1500;
+ top: 45px;
+ z-index: 1500;
}
#jsxc_windowList, #jsxc_windowListSB {
- z-index: 1500;
+ z-index: 1500;
}
#jsxc {
- padding: 20px;
- h1 {
- margin: 15px 0px 5px 0px;
- font-size: 1.5em;
- }
- a {
- color: blue;
- text-decoration: underline;
- &:hover {
- text-decoration: none;
- }
- }
+ padding: 20px;
+
+ h1 {
+ margin: 15px 0 5px;
+ font-size: 1.5em;
+ }
+
+ a {
+ color: blue;
+ text-decoration: underline;
+
+ &:hover {
+ text-decoration: none;
+ }
+ }
}
#jsxc_alt {
- text-align: right;
- margin: 15px;
- opacity: 0.5;
- font-style: italic;
- padding-top: 5px;
- clear: both;
- &:hover {
- opacity: 0.8;
- }
+ text-align: right;
+ margin: 15px;
+ opacity: 0.5;
+ font-style: italic;
+ padding-top: 5px;
+ clear: both;
+
+ &:hover {
+ opacity: 0.8;
+ }
}
#ojsxc {
- .form-group {
- margin-bottom: 0.8em;
- }
- .form-offset-label {
- @media (min-width: 768px) {
- padding-left: 280px;
- }
- }
- h3 {
- @media (min-width: 768px) {
- margin-left: 285px;
- }
- }
- label {
- box-sizing: border-box;
- padding-right: 15px;
- display: inline-block;
- @media (min-width: 768px) {
- width: 280px;
- text-align: right;
- }
- }
- input {
- box-sizing: border-box;
- padding-right: 15px;
- display: inline-block;
- width: 100%;
- &[type='checkbox'] {
- width: auto;
- }
- &[type='radio'] {
- width: auto;
- }
- @media (min-width: 768px) {
- width: auto;
- }
- }
- input+label {
+ .form-group {
+ margin-bottom: 0.8em;
+ }
+
+ .form-offset-label {
+ @media (min-width: 768px) {
+ padding-left: 280px;
+ }
+ }
+
+ h3 {
+ @media (min-width: 768px) {
+ margin-left: 285px;
+ }
+ }
+
+ label {
+ box-sizing: border-box;
+ padding-right: 15px;
+ display: inline-block;
+
+ @media (min-width: 768px) {
+ width: 280px;
+ text-align: right;
+ }
+ }
+
+ input {
+ box-sizing: border-box;
+ padding-right: 15px;
+ display: inline-block;
+ width: 100%;
+
+ &[type='checkbox'] {
+ width: auto;
+ }
+
+ &[type='radio'] {
+ width: auto;
+ }
+
+ @media (min-width: 768px) {
+ width: auto;
+ }
+
+ + label {
width: auto;
- }
- input+label+em {
- padding-left: 20px;
- }
- em, .boshUrl-msg {
- display: block;
- @media (min-width: 768px) {
- padding-left: 280px;
+
+ + em {
+ padding-left: 20px;
}
- }
+ }
+ }
+
+ em, .boshUrl-msg {
+ display: block;
+
+ @media (min-width: 768px) {
+ padding-left: 280px;
+ }
+ }
}
%msg {
- border: 1px solid #fff;
- border-radius: 3px;
- padding: 3px;
- padding-left: 22px;
- background-position: 3px center;
- background-repeat: no-repeat;
- margin: 3px;
- width: -moz-fit-content;
- width: -webkit-fit-content;
+ border: 1px solid #fff;
+ border-radius: 3px;
+ padding: 3px;
+ padding-left: 22px;
+ background-position: 3px center;
+ background-repeat: no-repeat;
+ margin: 3px;
+ width: -moz-fit-content;
+ width: -webkit-fit-content;
}
.jsxc_success {
- @extend %msg;
- background-color: #A1F6BB;
- background-image: url('../img/pass-icon.png');
- color: #003300;
- border-color: #003300;
+ @extend %msg;
+
+ background-color: #A1F6BB;
+ background-image: url("../img/pass-icon.png");
+ color: #030;
+ border-color: #030;
}
.jsxc_fail {
- @extend %msg;
- background-color: #FF9999;
- background-image: url('../img/fail-icon.png');
- color: #800000;
- border-color: #800000;
+ @extend %msg;
+
+ background-color: #F99;
+ background-image: url("../img/fail-icon.png");
+ color: #800000;
+ border-color: #800000;
}
.jsxc_log {
- width: 500px;
+ width: 500px;
}
#mainContainer, #odf-toolbar {
- right: 0px;
- left: 0px;
- 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;
- }
+ 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;
+ }
}