Skip to content

Commit 4c596ce

Browse files
committed
Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x
2 parents 002b907 + e406872 commit 4c596ce

File tree

12 files changed

+23
-27
lines changed

12 files changed

+23
-27
lines changed

app/Resources/public/css/chat.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@
9797
-moz-border-radius: 10px;
9898
border-radius: 10px;
9999
color: #666;
100-
margin-bottom: -1px;
100+
margin-bottom: 5px;
101101
padding: 10px;
102+
cursor: pointer;
102103
}
103104
.chat-user .user-image-chat {
104105
-webkit-border-radius: 10px;

app/Resources/public/css/themes/cool_blue/default.css

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,7 @@ a:hover{
8181
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
8282
}
8383
.navbar-default .navbar-nav > li > .dropdown-menu {
84-
background: #fe9700; /* Old browsers */
85-
background: -moz-linear-gradient(top, #fe9700 0%, #fd6800 100%); /* FF3.6+ */
86-
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fe9700), color-stop(100%,#fd6800)); /* Chrome,Safari4+ */
87-
background: -webkit-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Chrome10+,Safari5.1+ */
88-
background: -o-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Opera 11.10+ */
89-
background: -ms-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* IE10+ */
90-
background: linear-gradient(to bottom, #fe9700 0%,#fd6800 100%); /* W3C */
91-
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
84+
background: #FFFFFF;
9285
}
9386
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
9487
color: #ffffff;

app/Resources/public/css/themes/corporate/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2eaebb', end
7474
background: #3A4751;
7575
}
7676
.navbar-default .navbar-nav > li > .dropdown-menu {
77-
background-color: #FE9A2E; ;
77+
background-color: #FFF; ;
7878
}
7979
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
8080
color: #ffffff;

app/Resources/public/css/themes/cosmic_campus/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ header{
7878
color: #9DD0F1;
7979
}
8080
.navbar-default .navbar-nav > li > .dropdown-menu {
81-
background-color: #E48A1D;
81+
background-color: #FFFFFF;
8282
}
8383
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
8484
color: #ffffff;

app/Resources/public/css/themes/delicious_bordeaux/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ color: #FFFFFF;
7474
background: #800020;
7575
}
7676
.navbar-default .navbar-nav > li > .dropdown-menu {
77-
background-color: #800020;
77+
background-color: #FFFFFF;
7878
}
7979
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
8080
color: #ffffff;

app/Resources/public/css/themes/fruity_orange/default.css

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,7 @@ color: #FFFFFF;
7878
background: #FF650D;
7979
}
8080
.navbar-default .navbar-nav > li > .dropdown-menu {
81-
background: #ff670f;
82-
background: -moz-linear-gradient(top, #ff670f 0%, #fc3200 100%);
83-
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff670f), color-stop(100%,#fc3200));
84-
background: -webkit-linear-gradient(top, #ff670f 0%,#fc3200 100%);
85-
background: -o-linear-gradient(top, #ff670f 0%,#fc3200 100%);
86-
background: -ms-linear-gradient(top, #ff670f 0%,#fc3200 100%);
87-
background: linear-gradient(to bottom, #ff670f 0%,#fc3200 100%);
88-
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff670f', endColorstr='#fc3200',GradientType=0 );
81+
background: #FFFFFF;
8982
}
9083
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
9184
color: #ffffff;

app/Resources/public/css/themes/medical/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ color: #FFFFFF;
8989
background: #F38A1E;
9090
}
9191
.navbar-default .navbar-nav > li > .dropdown-menu {
92-
background: #2C9BB6;
92+
background: #FFFFFF;
9393
}
9494
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
9595
color: #fff;

app/Resources/public/css/themes/royal_purple/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ background: linear-gradient(to bottom, #f7a400 0%,#ff7400 100%); /* W3C */
8181
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7a400', endColorstr='#ff7400',GradientType=0 ); /* IE6-9 */
8282
}
8383
.navbar-default .navbar-nav > li > .dropdown-menu {
84-
background-color: #FB8B00;
84+
background-color: #FFFFFF;
8585
}
8686
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
8787
color: #ffffff;

app/Resources/public/css/themes/sober_brown/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ color: #FFFFFF;
6666
background: #6B1F05; /* Old browsers */
6767
}
6868
.navbar-default .navbar-nav > li > .dropdown-menu {
69-
background-color: #B83609;
69+
background-color: #FFFFFF;
7070
}
7171
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
7272
color: #ffffff;

app/Resources/public/css/themes/steel_grey/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ color: #FFFFFF;
6666
background: #677877; /* Old browsers */
6767
}
6868
.navbar-default .navbar-nav > li > .dropdown-menu {
69-
background-color: #B83609;
69+
background-color: #FFFFFF;
7070
}
7171
.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
7272
color: #ffffff;

0 commit comments

Comments
 (0)