Commit b4881332 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

New colors for topbar menu-icon and menu

parent efefe353

assets/sopds-sass/scss/_settings.scss

+12 −6
Original line number Diff line number Diff line
@@ -47,7 +47,12 @@ $sopds-bg-color: #f15a23; 
$sopds-bg-hover: scale-color($sopds-bg-color, $lightness: -15%);

$sopds-topbar-bg-color: #ffffff;

$sopds-title-color: #f15a23;

$sopds-hover-color: scale-color($sopds-title-color, $lightness: -15%);

$sopds-hover-color: scale-color($sopds-title-color, $lightness: -40%);



$sopds-menu-bg-color: #f15a23;

$sopds-menu-color: #FFFFFF;

$sopds-menu-bg-hover-color: scale-color($sopds-menu-bg-color, $lightness: -20%);

$sopds-menu-hover-color: scale-color($sopds-menu-color, $lightness: -15%);



// 1. Global

// ---------
@@ -386,10 +391,11 @@ $mediaobject-image-width-stacked: 100%; 


$menu-margin: 0;

$menu-margin-nested: 1rem;

//$menu-item-padding: 0.7rem 1rem;

$menu-item-padding: 0.25rem 1rem;

$menu-item-padding: 0.5rem 1rem;

//$menu-item-padding: 0.25rem 1rem;

$menu-item-color-active: $white;

$menu-item-background-active: map-get($foundation-palette, primary);

//$menu-item-background-active: map-get($foundation-palette, primary);

$menu-item-background-active: $sopds-menu-bg-hover-color;

$menu-icon-spacing: 0.25rem;



// 23. Meter
@@ -547,8 +553,8 @@ $titlebar-background: $black; 
$titlebar-color: $white;

$titlebar-padding: 0.5rem;

$titlebar-text-font-weight: bold;

$titlebar-icon-color: $white;

$titlebar-icon-color-hover: $medium-gray;

$titlebar-icon-color: $sopds-title-color;

$titlebar-icon-color-hover: $sopds-hover-color;

$titlebar-icon-spacing: 0.25rem;



// 35. Tooltip

assets/sopds-sass/scss/sopds.scss

+6 −0
Original line number Diff line number Diff line
@@ -65,3 +65,9 @@ 
  color : $sopds-title-color;

}



.sopdsmenu {

  background-color: $sopds-menu-bg-color;

  a { color : $sopds-menu-color; }

  a:hover { color: $sopds-menu-hover-color; } 

  color : $sopds-menu-color;

}

sopds_web_backend/static/css/sopds.css

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

sopds_web_backend/templates/sopds_menu.html

+2 −2
Original line number Diff line number Diff line 
<div class="menu sopdsbg" id="main_menu" style="padding:0.2rem 0rem;">

<div class="menu sopdsmenu" id="main_menu">

  <ul class="menu">

    <li><a href="#">Каталоги</a></li>

    <li class="active"><a href="#">Каталоги</a></li>

    <li><a href="#">Книги</a></li>

    <li><a href="#">Авторы</a></li>

    <li><a href="#">Жанры</a></li>

sopds_web_backend/templates/sopds_top.html

+1 −1
Original line number Diff line number Diff line 
<div class="top-bar">

    <div class="top-bar-title">

        <span data-responsive-toggle="main-menu" data-hide-for="medium">

          <button class="menu-icon dark" type="button" data-toggle=""></button>

          <button class="menu-icon" type="button" data-toggle=""></button>

        </span>

       <div class="title-bar-title">

           <div class="show-for-small-only">SOPDS</div>