diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css index e4aaea42f..9ea922376 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css +++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css @@ -1081,6 +1081,48 @@ body { color: #0082ff; } +.block-quicktabs ul.quicktabs-tabs { + margin: 70px 0 40px !important; + text-align: center; +} +.block-quicktabs ul.quicktabs-tabs li { + margin-right: 20px; + margin-left: 20px; + border-bottom: 2px solid #d3d3d3; + font-size: 20px; + position: relative; + display: inline-block; + vertical-align: top; + text-decoration: none; + padding: 9px 30px; + text-align: left; + cursor: pointer; +} +.block-quicktabs ul.quicktabs-tabs li a { + color: #999; +} +.block-quicktabs ul.quicktabs-tabs li.active, .block-quicktabs ul.quicktabs-tabs li:hover { + border-bottom-color: #1e88e5; +} +.block-quicktabs ul.quicktabs-tabs li.active a, .block-quicktabs ul.quicktabs-tabs li:hover a { + color: #1e88e5; +} +.block-quicktabs .quicktabs-main ul { + list-style: none; +} +.block-quicktabs .quicktabs-main ul li { + padding: 13px 0px; + border-bottom: 1px solid #e5e5e5; +} +.block-quicktabs .quicktabs-main ul li:first-child { + border-top: 1px solid #e5e5e5; +} +.block-quicktabs .quicktabs-main ul li a { + color: #333333; + font-size: 18px; + font-weight: 400; +} + .modal, .rexister-modal { position: fixed; left: 0%; @@ -2102,15 +2144,13 @@ nav.tabs { border-bottom: 1px none #b3d8eb; } nav.tabs li { - margin-right: 20px; - margin-left: 20px; + margin-right: 12px; border-bottom: 2px solid #d3d3d3; font-size: 20px; position: relative; display: inline-block; vertical-align: top; text-decoration: none; - padding: 9px 30px; text-align: left; cursor: pointer; } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme index d3b0025c4..16d9fe5ca 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme +++ b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme @@ -3,18 +3,11 @@ // Funkcije, ki jih uporablja Pro 1ka tema //use Drupal\Core\Language\Language; - - function pro1ka_preprocess_page(&$variables) { - //$language = \Drupal::languageManager()->getCurrentLanguage()->getId(); -// dump($variables['main_menu']); -// $variables['language'] = '/'.drupal_get_path('theme','atvdirect') .'/logo.png'; - - if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') { - include_once(__DIR__ . '/../../../../../../lang/1.php'); + include(__DIR__ . '/../../../../../../lang/1.php'); }else{ - include_once(__DIR__ . '/../../../../../../lang/2.php'); + include(__DIR__ . '/../../../../../../lang/2.php'); } $variables['lang'] = $lang; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/colors.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/colors.scss index ed97562fb..00bfb483f 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/colors.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/bacis/colors.scss @@ -7,6 +7,9 @@ $temo-modra: #0040A9; $sv-modra: #D4F0FC; $siva: #D1D1D1; +$siva-5: #e5e5e5; +$siva-3: #d3d3d3; +$siva-9: #999; $crna-pisava: #333333; $siva-badge: #AAADB0; $siva-ozdaje: #F8F8F8; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss index 5fda8cc63..b86a0ae9c 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss @@ -284,15 +284,13 @@ nav.tabs { border-bottom: 1px none #b3d8eb; li{ - margin-right: 20px; - margin-left: 20px; + margin-right: 12px; border-bottom: 2px solid #d3d3d3; font-size: 20px; position: relative; display: inline-block; vertical-align: top; text-decoration: none; - padding: 9px 30px; text-align: left; cursor: pointer; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss new file mode 100644 index 000000000..c01d0ad8f --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss @@ -0,0 +1,58 @@ +.block-quicktabs{ + + + ul.quicktabs-tabs { + margin: 70px 0 40px !important; + text-align: center; + + li { + margin-right: 20px; + margin-left: 20px; + border-bottom: 2px solid $siva-3; + font-size: 20px; + position: relative; + display: inline-block; + vertical-align: top; + text-decoration: none; + padding: 9px 30px; + text-align: left; + cursor: pointer; + + + a { + color: $siva-9; + } + + &.active, &:hover { + border-bottom-color: $modra; + + a { + color: $modra; + } + } + } + } + + .quicktabs-main { + + ul { + list-style: none; + + li{ + padding: 13px 0px; + border-bottom: 1px solid $siva-5; + + &:first-child{ + border-top: 1px solid $siva-5; + } + + a{ + color: #333333; + font-size: 18px; + font-weight: 400; + } + } + } + } + +} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/components.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/components.scss index 5e7dc50e4..bca185656 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/components.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/components.scss @@ -1,4 +1,5 @@ @import "breadcrumbs"; +@import "quicktabs"; @import "popup"; @import "form"; @import "nakup"; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg new file mode 100755 index 000000000..6f616038a --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/svg/1ka_logo_en.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +