From bdbc34b163f3f411ce560b6d82aac55e30f265a6 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Sat, 14 Jan 2017 01:35:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B5?= =?UTF-8?q?=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D1=81=D1=8B=D0=BB=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/accounts/accountSwitcher.scss | 13 ------------- src/components/auth/appInfo/appInfo.scss | 5 +---- src/components/auth/helpLinks.scss | 12 ------------ src/components/footerMenu/footerMenu.scss | 9 +-------- src/components/langMenu/langMenu.scss | 9 +-------- src/components/profile/profile.scss | 7 ++++--- src/components/profile/profileForm.scss | 1 + src/components/ui/buttons.scss | 4 ++-- src/components/ui/form/form.scss | 4 +--- src/components/ui/panel.scss | 6 ++---- src/index.scss | 8 ++++++++ src/pages/404/404.scss | 12 ------------ src/pages/root/root.scss | 3 ++- src/pages/rules/rules.scss | 4 +--- 14 files changed, 24 insertions(+), 73 deletions(-) diff --git a/src/components/accounts/accountSwitcher.scss b/src/components/accounts/accountSwitcher.scss index dc3d08c..1bcf0ce 100644 --- a/src/components/accounts/accountSwitcher.scss +++ b/src/components/accounts/accountSwitcher.scss @@ -83,19 +83,6 @@ $lightBorderColor: #eee; &:last-of-type { margin-bottom: 0; } - - a { - color: #666; - font-size: 12px; - border-bottom: 1px dotted #666; - text-decoration: none; - transition: .25s; - - &:hover { - border-bottom-color: #aaa; - color: #777; - } - } } .accountInfo { diff --git a/src/components/auth/appInfo/appInfo.scss b/src/components/auth/appInfo/appInfo.scss index d33ddcc..90ef061 100644 --- a/src/components/auth/appInfo/appInfo.scss +++ b/src/components/auth/appInfo/appInfo.scss @@ -45,12 +45,9 @@ a { color: lighten($font-color, 10%); - border-bottom: 1px dotted #666; - text-decoration: none; - transition: .25s; + border-bottom-color: #666; &:hover { - border-bottom-color: #777; color: $font-color; } } diff --git a/src/components/auth/helpLinks.scss b/src/components/auth/helpLinks.scss index 3e6dfc0..9769a7e 100644 --- a/src/components/auth/helpLinks.scss +++ b/src/components/auth/helpLinks.scss @@ -6,16 +6,4 @@ color: #444; text-align: center; font-size: 16px; - - a { - color: #444; - border-bottom: 1px dotted #444; - text-decoration: none; - transition: .25s; - - &:hover { - border-bottom-color: #777; - color: #777; - } - } } diff --git a/src/components/footerMenu/footerMenu.scss b/src/components/footerMenu/footerMenu.scss index 085de1c..e67d34d 100644 --- a/src/components/footerMenu/footerMenu.scss +++ b/src/components/footerMenu/footerMenu.scss @@ -5,13 +5,6 @@ a { color: #666; - border-bottom: 1px dotted #666; - text-decoration: none; - transition: .25s; - - &:hover { - border-bottom-color: #777; - color: #777; - } + border-bottom-color: #666; } } diff --git a/src/components/langMenu/langMenu.scss b/src/components/langMenu/langMenu.scss index aedb942..814721a 100644 --- a/src/components/langMenu/langMenu.scss +++ b/src/components/langMenu/langMenu.scss @@ -118,14 +118,7 @@ a { color: #9a9a9a; - border-bottom: 1px dotted #9a9a9a; - text-decoration: none; - transition: .25s; - - &:hover { - border-bottom-color: #777; - color: #777; - } + border-bottom-color: #9a9a9a; } } diff --git a/src/components/profile/profile.scss b/src/components/profile/profile.scss index 99c0c0e..cfb856a 100644 --- a/src/components/profile/profile.scss +++ b/src/components/profile/profile.scss @@ -76,6 +76,7 @@ $formColumnWidth: 416px; .paramAction { text-align: center; cursor: pointer; + border-bottom: none; } .paramEditIcon { @@ -97,9 +98,9 @@ $formColumnWidth: 416px; line-height: 1.2; a { - color: $red; - border-bottom: 1px dashed transparent; - transition: .25s; + color: $red!important; + border-bottom-color: transparent; + border-bottom-style: dashed; &:hover { border-bottom-color: lighter($red); diff --git a/src/components/profile/profileForm.scss b/src/components/profile/profileForm.scss index bccaf50..76645c2 100644 --- a/src/components/profile/profileForm.scss +++ b/src/components/profile/profileForm.scss @@ -15,6 +15,7 @@ height: 25px; padding: 15px; font-size: 25px; + border-bottom: none; color: #ccc; diff --git a/src/components/ui/buttons.scss b/src/components/ui/buttons.scss index 75a968c..510c3fe 100644 --- a/src/components/ui/buttons.scss +++ b/src/components/ui/buttons.scss @@ -6,7 +6,7 @@ composes: button; @if ($textColor != $defaultButtonTextColor) { - color: $textColor; + color: $textColor!important; } background-color: $backgroundColor; @@ -29,7 +29,7 @@ border: none; font-family: $font-family-title; - color: $defaultButtonTextColor; + color: $defaultButtonTextColor!important; font-size: 18px; line-height: 50px; text-decoration: none; diff --git a/src/components/ui/form/form.scss b/src/components/ui/form/form.scss index d23dd53..7e0e799 100644 --- a/src/components/ui/form/form.scss +++ b/src/components/ui/form/form.scss @@ -142,9 +142,7 @@ margin: 3px 0; a { - border-bottom: 1px dotted rgba($red, 0.75); - text-decoration: none; - transition: .25s; + border-bottom-color: rgba($red, 0.75); color: $red; &:hover { diff --git a/src/components/ui/panel.scss b/src/components/ui/panel.scss index b15ee36..3ac3b37 100644 --- a/src/components/ui/panel.scss +++ b/src/components/ui/panel.scss @@ -51,10 +51,8 @@ $bodyTopBottomPadding: 15px; } a { - color: #fff; - border-bottom: 1px dotted rgba(#fff, 0.75); - text-decoration: none; - transition: .25s; + color: #fff!important; + border-bottom-color: rgba(#fff, 0.75); &:hover { border-bottom-color: rgba(#fff, 0.5); diff --git a/src/index.scss b/src/index.scss index bd56c3a..612072d 100644 --- a/src/index.scss +++ b/src/index.scss @@ -21,7 +21,15 @@ b { } a { + color: #444; + border-bottom: 1px dotted #444; text-decoration: none; + transition: .25s; + + &:hover { + border-bottom-color: #777; + color: #777; + } } ul, diff --git a/src/pages/404/404.scss b/src/pages/404/404.scss index daca817..f631d2f 100644 --- a/src/pages/404/404.scss +++ b/src/pages/404/404.scss @@ -187,16 +187,4 @@ font-size: 16px; margin-top: 5px; color: #9a9a9a; - - a { - color: #666; - border-bottom: 1px dotted #666; - text-decoration: none; - transition: .25s; - - &:hover { - border-bottom-color: #777; - color: #777; - } - } } diff --git a/src/pages/root/root.scss b/src/pages/root/root.scss index 8edb797..62a81f6 100644 --- a/src/pages/root/root.scss +++ b/src/pages/root/root.scss @@ -40,10 +40,11 @@ $userBarHeight: 50px; padding: 0 20px; display: inline-block; background: darker($green); + border-bottom: none; font-family: $font-family-title; font-size: 33px; - color: #fff; + color: #fff!important; } .body { diff --git a/src/pages/rules/rules.scss b/src/pages/rules/rules.scss index 4fc9f50..5148997 100644 --- a/src/pages/rules/rules.scss +++ b/src/pages/rules/rules.scss @@ -84,9 +84,7 @@ a { color: #444; - border-bottom: 1px dotted #aaa; - text-decoration: none; - transition: .25s; + border-bottom-color: #aaa; &:hover { border-bottom-color: #444