replace/rename/merge files + small fixes

grin3671 · Oct 23, 2019 · 5bcecf4 · 5bcecf4
1 parent 45a5231
commit 5bcecf4
Show file tree

Hide file tree

Showing 19 changed files with 385 additions and 427 deletions.
diff --git a/assets/achievements.sass b/assets/achievements.sass
diff --git a/assets/b-buttons.sass b/assets/b-buttons.sass
diff --git a/assets/blocks/b-buttons.sass b/assets/blocks/b-buttons.sass
@@ -0,0 +1,18 @@
+.b-button
+  @extend %md-button-flat
+
+a.b-button
+  color: $color-primary
+
+  @media (min-width: 1025px)
+    &:hover
+      color: $color-primary
+
+  &:active
+    color: $color-primary
+
+
+  & + .b-js-link,
+  // Кнопка отмена (Клуб > Настройки > Страницы)
+  & + .cancel
+    @extend %md-button-flat
diff --git a/assets/blocks/b-form.sass b/assets/blocks/b-form.sass
@@ -5,4 +5,19 @@
   &::after
     // content: ''
     display: block
-    // clear: both
+    // clear: both
+
+  input[type=submit]
+    @extend %md-button-raised
+
+    &[disabled],
+    &.disabled
+      background-color: $color-button-hover
+      box-shadow: none
+      color: $color-text-disabled !important
+
+  .cancel
+    @extend %md-button-flat
+
+    &:hover
+      text-decoration: none
diff --git a/assets/blocks/b-shiki_editor.sass b/assets/blocks/b-shiki_editor.sass
@@ -1,4 +1,3 @@
-
 .b-shiki_editor
   aside.markers
     position: relative
@@ -109,6 +108,23 @@
     .preview
       margin: .375rem .5rem .375rem 0
 
+    // .b-shiki_editor footer .unpreview
+    // .b-shiki_editor.previewed footer .unpreview
+    .unpreview:not(.link)
+      @extend %md-button-flat
+      font-size: 0
+
+      &::after
+        content: 'Редактировать'
+        vertical-align: top
+        font-size: .875rem
+
+      [data-locale=en] &::after
+        content: 'Edit'
+
+    .cancel
+      @extend %md-button-flat
+
     .about-bb_codes
       position: relative
       padding: .5rem

diff --git a/assets/blocks/b-topic-preview.sass b/assets/blocks/b-topic-preview.sass
@@ -5,3 +5,6 @@
 
     @media screen and (max-width: 767px)
       padding-left: 0
+
+  & > .editor-container .hide
+    @extend %md-button-flat
diff --git a/assets/blocks/lib-buttons.sass b/assets/blocks/lib-buttons.sass
@@ -27,6 +27,12 @@
   font-size: inherit
   font-weight: 700
 
+  // Кнопка "Отмена" в редактировании аниме в своём списке
+  & > div,
+  // buttons (25px for <1024px & 15px for >1025px)
+  & a:not(.b-button)
+    line-height: 1.5rem !important
+
 
   .editor-controls
     overflow-x: auto

diff --git a/assets/menu-updated.sass → assets/layouts/l-menu.sass b/assets/menu-updated.sass → assets/layouts/l-menu.sass
diff --git a/assets/rightbar.sass → assets/layouts/l-sidebar.sass b/assets/rightbar.sass → assets/layouts/l-sidebar.sass
@@ -37,6 +37,7 @@
     z-index: 10
 
     .toggler
+      @extend %material-icons
       border-radius: 4px
       padding: 0 .25em
       line-height: 24px
@@ -45,9 +46,7 @@
         content: 'chevron_right' !important
         display: inline-block
         vertical-align: top
-        width: 1em
         margin: 0
-        font-size: 1.5em
         opacity: .72
         transition: .16s cubic-bezier(.4,0,.6,1)
 

diff --git a/assets/main.sass b/assets/main.sass
@@ -373,36 +373,6 @@ input
 
 
 
-/* Стили Material Icons */
-.l-page .menu-toggler .toggler::before
-  font-family: 'Material Icons' !important
-  font-weight: normal !important
-  line-height: 1
-
-  letter-spacing: normal
-  text-transform: none
-  word-wrap: normal
-  white-space: nowrap
-  direction: ltr
-
-  /* Support for all WebKit browsers. */
-  -webkit-font-smoothing: antialiased
-  /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility
-  /* Support for Firefox. */
-  -moz-osx-font-smoothing: grayscale
-  /* Support for IE. */
-  font-feature-settings: 'liga'
-
-
-
-
-
-
-
-
-
-
 /* TODO: replace */
 .b-catalog-entry-embedded
   .b-catalog_entry