From 6ca0811f989dda0ac83b1602ceec625723426643 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Thu, 16 Mar 2017 15:33:49 -0500 Subject: [PATCH] removed important from css --- app/assets/stylesheets/app/_editor.scss | 16 ++++--------- app/assets/stylesheets/app/_header.scss | 24 +++++++------------ app/assets/stylesheets/app/_mostrap.scss | 2 +- app/assets/stylesheets/app/_notes.scss | 10 ++++---- app/assets/stylesheets/app/_tags.scss | 24 +++++++++---------- .../templates/frontend/editor.html.haml | 4 ++-- .../templates/frontend/header.html.haml | 2 +- app/assets/templates/frontend/notes.html.haml | 2 +- app/assets/templates/frontend/tags.html.haml | 6 ++--- 9 files changed, 39 insertions(+), 51 deletions(-) diff --git a/app/assets/stylesheets/app/_editor.scss b/app/assets/stylesheets/app/_editor.scss index ed7fe932c..c52eed0ca 100644 --- a/app/assets/stylesheets/app/_editor.scss +++ b/app/assets/stylesheets/app/_editor.scss @@ -16,24 +16,19 @@ $heading-height: 75px; padding: 0; } - .section-title-bar { - border-bottom: none !important; - height: $heading-height !important; - } - .section-menu { flex: 1 0 28px; max-height: 28px; } } -.editor-heading { - +#editor-title-bar { width: 100%; padding: 15px; - padding-top: 0px; background-color: white; + border-bottom: none; + height: $heading-height; min-height: $heading-height; padding-right: 10px; @@ -64,8 +59,8 @@ $heading-height: 75px; } - .save-status { - width: 20% !important; + #save-status { + width: 20%; float: right; position: absolute; @@ -74,7 +69,6 @@ $heading-height: 75px; text-transform: none; font-weight: normal; margin-top: 4px; - width: 120px; text-align: right; color: rgba(black, 0.23); } diff --git a/app/assets/stylesheets/app/_header.scss b/app/assets/stylesheets/app/_header.scss index fdeb83a11..30a98150a 100644 --- a/app/assets/stylesheets/app/_header.scss +++ b/app/assets/stylesheets/app/_header.scss @@ -13,7 +13,7 @@ h2 { margin-top: 0px; } -.footer-bar { +#footer-bar { position: relative; width: 100%; padding: 5px; @@ -23,7 +23,6 @@ h2 { z-index: 100; font-size: 10px; color: $dark-gray; - border-bottom: 1px solid rgba(#979799, 0.4); .medium-text { font-size: 14px; @@ -35,11 +34,11 @@ h2 { color: $blue-color; &.gray { - color: $dark-gray !important; + color: $dark-gray; } &.block { - display: block !important; + display: block; } } @@ -59,14 +58,14 @@ h2 { h3 { - font-size: 14px !important; - margin-top: 4px !important; - margin-bottom: 3px !important; + font-size: 14px ; + margin-top: 4px ; + margin-bottom: 3px; } h4 { - margin-bottom: 4px !important; - font-size: 13px !important; + margin-bottom: 4px; + font-size: 13px; } section { @@ -88,7 +87,7 @@ h2 { } } -.footer-bar-link { +#footer-bar .footer-bar-link { font-size: 11px; font-weight: bold; margin-left: 8px; @@ -161,11 +160,6 @@ button.light { border: 1px solid rgba(gray, 0.2); } -.item.last-refreshed { - font-weight: normal !important; - cursor: default !important; -} - a.disabled { pointer-events: none; } diff --git a/app/assets/stylesheets/app/_mostrap.scss b/app/assets/stylesheets/app/_mostrap.scss index 2776256a1..c15c66276 100644 --- a/app/assets/stylesheets/app/_mostrap.scss +++ b/app/assets/stylesheets/app/_mostrap.scss @@ -180,7 +180,7 @@ button:focus {outline:0;} background-image: none; border: 1px solid #ccc; border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + box-shadow: 0; -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; } diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss index 4294ff6de..f0dd9e532 100644 --- a/app/assets/stylesheets/app/_notes.scss +++ b/app/assets/stylesheets/app/_notes.scss @@ -8,12 +8,12 @@ $notes-title-bar-height: 130px; - .notes-title-bar { + #notes-title-bar { color: rgba(black, 0.40); - padding-top: 16px !important; - height: $notes-title-bar-height !important; - font-weight: normal !important; - font-size: 18px !important; + padding-top: 16px; + height: $notes-title-bar-height; + font-weight: normal; + font-size: 18px; } .tag-menu-bar { diff --git a/app/assets/stylesheets/app/_tags.scss b/app/assets/stylesheets/app/_tags.scss index d243566f9..a12ad01ba 100644 --- a/app/assets/stylesheets/app/_tags.scss +++ b/app/assets/stylesheets/app/_tags.scss @@ -5,26 +5,26 @@ $tags-title-bar-height: 55px; - .tags-title-bar { - color: black; - height: $tags-title-bar-height !important; - padding-left: 12px !important; - padding-right: 12px !important; - font-size: 12px !important; - color: rgba(black, 0.8); + #tags-title-bar { + color: black; + height: $tags-title-bar-height; + padding-left: 12px; + padding-right: 12px; + font-size: 12px; + color: rgba(black, 0.8); } - .content { - background-color: #f6f6f6 !important; + #tags-content { + background-color: #f6f6f6; } - .tag-add-button { + #tag-add-button { margin-top: -6px; - background-color: #d7d7d7 !important; + background-color: #d7d7d7; float: right; &:hover { - background-color: rgba(#d7d7d7, 0.8) !important; + background-color: rgba(#d7d7d7, 0.8); } } diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml index 5394baecd..082d5596a 100644 --- a/app/assets/templates/frontend/editor.html.haml +++ b/app/assets/templates/frontend/editor.html.haml @@ -1,10 +1,10 @@ .section.editor{"ng-class" => "{'fullscreen' : ctrl.fullscreen}"} - .section-title-bar.editor-heading{"ng-if" => "ctrl.note", "ng-class" => "{'fullscreen' : ctrl.fullscreen }"} + #editor-title-bar.section-title-bar{"ng-if" => "ctrl.note", "ng-class" => "{'fullscreen' : ctrl.fullscreen }"} .title %input.input#note-title-editor{"ng-model" => "ctrl.note.title", "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTitle($event)", "ng-change" => "ctrl.nameChanged()", "ng-focus" => "ctrl.onNameFocus()", "select-on-click" => "true"} - .save-status{"ng-class" => "{'red bold': ctrl.saveError}", "ng-bind-html" => "ctrl.noteStatus"} + #save-status{"ng-class" => "{'red bold': ctrl.saveError}", "ng-bind-html" => "ctrl.noteStatus"} .editor-tags %input.tags-input{"type" => "text", "ng-keyup" => "$event.keyCode == 13 && $event.target.blur();", "ng-model" => "ctrl.tagsString", "placeholder" => "#tags", "ng-blur" => "ctrl.updateTagsFromTagsString($event, ctrl.tagsString)"} diff --git a/app/assets/templates/frontend/header.html.haml b/app/assets/templates/frontend/header.html.haml index 972825eaf..a908c2f4b 100644 --- a/app/assets/templates/frontend/header.html.haml +++ b/app/assets/templates/frontend/header.html.haml @@ -1,4 +1,4 @@ -.footer-bar +#footer-bar .pull-left .footer-bar-link{"click-outside" => "ctrl.showAccountMenu = false;", "is-open" => "ctrl.showAccountMenu"} %a{"ng-click" => "ctrl.accountMenuPressed()", "ng-class" => "{red: ctrl.error}"} Account diff --git a/app/assets/templates/frontend/notes.html.haml b/app/assets/templates/frontend/notes.html.haml index 98bb494a4..ac5bd606b 100644 --- a/app/assets/templates/frontend/notes.html.haml +++ b/app/assets/templates/frontend/notes.html.haml @@ -1,6 +1,6 @@ .section.notes .content - .section-title-bar.notes-title-bar + .section-title-bar#notes-title-bar .title {{ctrl.tag.title}} notes .add-button{"ng-click" => "ctrl.createNewNote()"} + %br diff --git a/app/assets/templates/frontend/tags.html.haml b/app/assets/templates/frontend/tags.html.haml index 89f0c1a66..dcc21d6e7 100644 --- a/app/assets/templates/frontend/tags.html.haml +++ b/app/assets/templates/frontend/tags.html.haml @@ -1,8 +1,8 @@ .section.tags - .content - .section-title-bar.tags-title-bar + #tags-content.content + #tags-title-bar.section-title-bar .title Tags - .add-button.tag-add-button{"ng-click" => "ctrl.clickedAddNewTag()"} + + .add-button#tag-add-button{"ng-click" => "ctrl.clickedAddNewTag()"} + {{ctrl.test}} .scrollable