Просмотр исходного кода

Merge pull request #847 from aragonc/bootstrap

Cambios Bootstrap 23
Yannick Warnier 9 лет назад
Родитель
Сommit
7ef0b6a347

+ 14 - 9
app/Resources/public/css/base.css

@@ -100,7 +100,15 @@ a.thumbnail:hover{
     font-size:22px;
     margin-top:5px;
 }
-#announcements-slider .left, #announcements-slider .right{
+#carousel-announcement{
+    min-height: 300px;
+}
+#carousel-announcement img{
+    display: block;
+    max-width: 100%;
+    height: auto;
+}
+#carousel-announcement .left, #carousel-announcement .right{
   position: absolute;
   top: 50%;
   background: #00829C;
@@ -115,26 +123,23 @@ a.thumbnail:hover{
   -webkit-border-radius: 4px;
   opacity: 0.8;
 }
-#announcements-slider .left{
+#carousel-announcement .left{
   left: 10px;
 }
-#announcements-slider .right{
+#carousel-announcement .right{
   right: 10px;
 }
-#announcements-slider .carousel-indicators li{
+#carousel-announcement .carousel-indicators li{
   width: 20px;
   height: 20px;
   background-color: #fff;
   margin: 0px 15px 0px 0px;
   position: relative;
 }
-#announcements-slider .carousel-indicators .active{
+#carousel-announcement .carousel-indicators .active{
   background: #C52D2F;
 }
-#announcements-slider .carousel-inner img {
-    height: auto;
-    width: 100%;
-}
+
 #notice_block p, #notice-block p{
     color: #666;
     font-size: 12px;

+ 148 - 0
app/Resources/public/css/themes/sober_brown/default.css

@@ -0,0 +1,148 @@
+/*!
+ * CSS Sober Brown - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../chamilo/fonts/OpenSans.woff2) format('woff2'), url(../chamilo/fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #666666;
+}
+a:hover{
+  color: #B83609;
+  text-decoration: none;
+}
+
+.navbar-default {
+background: #521804;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+color: #FFFFFF;
+background: #6B1F05; /* Old browsers */
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #B83609;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #F7490C;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+color: #FFFFFF;
+background: #F7490C;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+color: #FFFFFF;
+background: #F7490C;
+}
+.navbar-default .navbar-toggle {
+  border-color: #D45500;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #521804;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #D45500;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #F9F9F9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.panel-default .panel-heading{
+    background-color: #F9F9F9;
+}
+footer{
+  background: #782306;
+  color: #F7490C;
+  border-top: 4px solid #F7490C;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}
+.badge{
+    background-color: #F7490C;
+}
+#carousel-announcement .left, #carousel-announcement .right{
+    background: #F7490C;
+}

BIN
app/Resources/public/css/themes/sober_brown/images/header-logo.png


+ 164 - 0
app/Resources/public/css/themes/spacelab/default.css

@@ -0,0 +1,164 @@
+/*!
+ * CSS SpaceLab - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * OpenClipArt ilustration (https://openclipart.org/detail/178586/mad-scientist) By AnNinihah
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../chamilo/fonts/OpenSans.woff2) format('woff2'), url(../chamilo/fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #185B8E;
+}
+a:hover{
+  color: #3F9BC7;
+}
+header{
+  background: url("images/background.png") repeat-x center -25px;
+}
+.navbar-default {
+background: -moz-linear-gradient(top, rgba(92,107,106,0.29) 0%, rgba(15,32,36,0.85) 86%, rgba(15,32,36,0.94) 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(92,107,106,0.29)), color-stop(86%,rgba(15,32,36,0.85)), color-stop(100%,rgba(15,32,36,0.94))); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(92,107,106,0.29) 0%,rgba(15,32,36,0.85) 86%,rgba(15,32,36,0.94) 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(92,107,106,0.29) 0%,rgba(15,32,36,0.85) 86%,rgba(15,32,36,0.94) 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(92,107,106,0.29) 0%,rgba(15,32,36,0.85) 86%,rgba(15,32,36,0.94) 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(92,107,106,0.29) 0%,rgba(15,32,36,0.85) 86%,rgba(15,32,36,0.94) 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4a5c6b6a', endColorstr='#f00f2024',GradientType=0 ); /* IE6-9 */
+border:none;
+}
+.navbar{
+    border-bottom: 3px solid #4A8480;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+  color: #9DD0F1;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #E48A1D;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #C76027;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+  color: #ededed;
+  background: #465251;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+  color: #ededed;
+  background: #e48a1d; /* Old browsers */
+  background: -moz-linear-gradient(top, #e48a1d 0%, #e48a1d 52%, #c86027 52%, #c86027 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e48a1d), color-stop(52%,#e48a1d), color-stop(52%,#c86027), color-stop(100%,#c86027)); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #e48a1d 0%,#e48a1d 52%,#c86027 52%,#c86027 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top, #e48a1d 0%,#e48a1d 52%,#c86027 52%,#c86027 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top, #e48a1d 0%,#e48a1d 52%,#c86027 52%,#c86027 100%); /* IE10+ */
+  background: linear-gradient(to bottom, #e48a1d 0%,#e48a1d 52%,#c86027 52%,#c86027 100%); /* W3C */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e48a1d', endColorstr='#c86027',GradientType=0 ); /* IE6-9 */
+}
+.navbar-default .navbar-toggle {
+  border-color: #0099c0;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #ffffff;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #ddecef;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.panel-default .panel-heading{
+    background-color: #ddecef;
+}
+footer{
+  background: #272727;
+  color: #9DD0F1;
+  border-top: 4px solid #4A8480;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}
+#carousel-announcement .left, #carousel-announcement .right,
+#carousel-announcement .carousel-indicators .active{
+    background: #4A8480;
+}

BIN
app/Resources/public/css/themes/spacelab/images/background.png


BIN
app/Resources/public/css/themes/spacelab/images/header-logo.png


Разница между файлами не показана из-за своего большого размера
+ 4031 - 0
app/Resources/public/css/themes/spacelab/svg/background.svg


+ 154 - 0
app/Resources/public/css/themes/steel_grey/default.css

@@ -0,0 +1,154 @@
+/*!
+ * CSS Steel Grey - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../chamilo/fonts/OpenSans.woff2) format('woff2'), url(../chamilo/fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #666666;
+}
+a:hover{
+  color: #B83609;
+  text-decoration: none;
+}
+
+.navbar-default {
+background: #5C6B6A;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+color: #FFFFFF;
+background: #677877; /* Old browsers */
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #B83609;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #F7490C;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+color: #FFFFFF;
+background: #465251;
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+color: #FFFFFF;
+background: #F7490C;
+}
+.navbar-default .navbar-toggle {
+  border-color: #D45500;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #521804;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #D45500;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #F9F9F9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.menu-column .panel-default .panel-heading{
+    background-color: #9EB8B6;
+}
+.menu-column .panel-default .panel-heading a:hover{
+    color: #111;
+}
+footer{
+  background: #465251;
+  color: #111;
+  border:none;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}
+.badge{
+    background-color: #F7490C;
+}
+#carousel-announcement .left, #carousel-announcement .right{
+    background: #5C6B6A;
+}
+#carousel-announcement .carousel-indicators .active{
+    background: #9EB8B6;
+}

BIN
app/Resources/public/css/themes/steel_grey/images/header-logo.png


+ 171 - 0
app/Resources/public/css/themes/tasty_olive/default.css

@@ -0,0 +1,171 @@
+/*!
+ * CSS Tasty Olive - v. 2.0
+ * 2015 - Alex Aragón (aragonc@beeznest.com)
+ * Licensed GPL
+ * Based on Bootstrap
+*/
+
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(../chamilo/fonts/OpenSans-Light.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(../chamilo/fonts/OpenSans.woff2) format('woff2'), url(../chamilo/fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../chamilo/fonts/OpenSans-Semibold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
+}
+html {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+  font-family: 'Open Sans', sans-serif;
+  line-height: 1.72222;
+}
+a{
+  color: #666666;
+}
+a:hover{
+  color: #7FA638;
+  text-decoration: none;
+}
+
+.navbar-default {
+background: #c4d82e; /* Old browsers */
+background: -moz-linear-gradient(top, #c4d82e 0%, #5b8b3e 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#c4d82e), color-stop(100%,#5b8b3e)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #c4d82e 0%,#5b8b3e 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #c4d82e 0%,#5b8b3e 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #c4d82e 0%,#5b8b3e 100%); /* IE10+ */
+background: linear-gradient(to bottom, #c4d82e 0%,#5b8b3e 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c4d82e', endColorstr='#5b8b3e',GradientType=0 ); /* IE6-9 */
+border-bottom: 2px solid #BFD42E;
+}
+.navbar-default .navbar-brand {
+  color: #ffffff;
+}
+.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
+  color: #ededed;
+}
+.navbar-default .navbar-text {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
+color: #FFFFFF;
+background: #7b8392; /* Old browsers */
+background: -moz-linear-gradient(top, #7b8392 0%, #4b5363 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8392), color-stop(100%,#4b5363)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* IE10+ */
+background: linear-gradient(to bottom, #7b8392 0%,#4b5363 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8392', endColorstr='#4b5363',GradientType=0 ); /* IE6-9 */
+}
+.navbar-default .navbar-nav > li > .dropdown-menu {
+  background-color: #A5C132;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
+  color: #ffffff;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
+.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
+  color: #ededed;
+  background-color: #374955;
+}
+.navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
+color: #FFFFFF;
+background: #7b8392; /* Old browsers */
+background: -moz-linear-gradient(top, #7b8392 0%, #4b5363 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8392), color-stop(100%,#4b5363)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* IE10+ */
+background: linear-gradient(to bottom, #7b8392 0%,#4b5363 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8392', endColorstr='#4b5363',GradientType=0 ); /* IE6-9 */
+}
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+color: #FFFFFF;
+background: #7b8392; /* Old browsers */
+background: -moz-linear-gradient(top, #7b8392 0%, #4b5363 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8392), color-stop(100%,#4b5363)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, #7b8392 0%,#4b5363 100%); /* IE10+ */
+background: linear-gradient(to bottom, #7b8392 0%,#4b5363 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8392', endColorstr='#4b5363',GradientType=0 ); /* IE6-9 */
+}
+.navbar-default .navbar-toggle {
+  border-color: #0099c0;
+}
+.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
+  background-color: #0099c0;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #ffffff;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #ffffff;
+}
+.navbar-default .navbar-link {
+  color: #ffffff;
+}
+.navbar-default .navbar-link:hover {
+  color: #ededed;
+}
+
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #ffffff;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #ededed;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #ededed;
+    background-color: #0099c0;
+  }
+}
+.breadcrumb{
+  background: #F9F9F9;
+  color: #006A84;
+}
+.nav li a:hover{
+    background: transparent;
+}
+.panel-default .panel-heading{
+    background-color: #F9F9F9;
+}
+footer{
+  background: #444444;
+  color: #9DD0F1;
+  border-top: 4px solid #C2DF44;
+}
+footer a{
+  color: #ffffff;
+}
+footer a:hover{
+  color: #CCC;
+}

BIN
app/Resources/public/css/themes/tasty_olive/images/header-logo.png


+ 32 - 28
main/template/default/announcement/slider.tpl

@@ -1,31 +1,35 @@
 <h4 class="page-header">{{ "SystemAnnouncements" | get_lang }}</h4>
+   
+ <div id="carousel-announcement" class="carousel slide" data-ride="carousel">
+  <!-- Indicators -->
+  <ol class="carousel-indicators">
+      {% for announcement in announcements %}
+        <li data-target="#carousel-announcement" data-slide-to="{{ loop.index0 }}" {% if loop.index0 == 0 %} class="active" {% endif %}></li>
+      {% endfor %}
+  </ol>
 
-<div id="announcements-slider" class="carousel slide" data-ride="carousel" style="height:300px;">
-    <ol class="carousel-indicators">
-        {% for announcement in announcements %}
-            <li data-target="#announcements-slider" data-slide-to="{{ loop.index0 }}" {% if loop.index0 == 0 %} class="active" {% endif %}></li>
-        {% endfor %}
-    </ol>
+  <!-- Wrapper for slides -->
+  <div class="carousel-inner" role="listbox">
+      {% for announcement in announcements %}
+        <div class="item {% if loop.index0 == 0 %} active {% endif %}">
+          {{ announcement.content }}
+            {% if announcement.readMore %}
+                <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
+            {% endif %}
+          <div class="carousel-caption">
+              <h3>{{ announcement.title }}</h3>
+          </div>
+        </div>
+    {% endfor %}
+  </div>
 
-    <div class="carousel-inner" role="listbox">
-        {% for announcement in announcements %}
-            <div class="item {% if loop.index0 == 0 %} active {% endif %}" style="height:300px;">
-
-                {{ announcement.content }}
-                {% if announcement.readMore %}
-                    <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
-                {% endif %}
-                <div class="carousel-caption">
-                    <h5>{{ announcement.title }}</h5>
-                </div>
-            </div>
-        {% endfor %}
-    </div>
-
-    <a class="left carousel-control" href="#announcements-slider" role="button" data-slide="prev">
-        <i class="fa fa-chevron-left"></i>
-    </a>
-    <a class="right carousel-control" href="#announcements-slider" role="button" data-slide="next">
-        <i class="fa fa-chevron-right"></i>
-    </a>
-</div>
+  <!-- Controls -->
+  <a class="left carousel-control" href="#carousel-announcement" role="button" data-slide="prev">
+    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
+  </a>
+  <a class="right carousel-control" href="#carousel-announcement" role="button" data-slide="next">
+    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
+  </a>
+</div>

+ 2 - 2
main/template/default/layout/header.js.tpl

@@ -80,8 +80,8 @@ $(document).ready(function(){
     check_brand();
     //if exists the toolbar admin
 
-    if($('#toolbar').length){
-        var heigthToolBar= $('#toolbar').height();
+    if($('#toolbar-admin').length){
+        var heigthToolBar= $('#toolbar-admin').height();
         $('header').css('margin-top', heigthToolBar+'px');
         $('#page-back').css('padding-top', heigthToolBar+20+'px');
     }

Некоторые файлы не были показаны из-за большого количества измененных файлов