Skip to content

Commit 0d4e57d

Browse files
aragoncaragonc
committed
fix css optimize base.css chat.css editor.css print.css scorm.css
1 parent b666c2d commit 0d4e57d

File tree

5 files changed

+164
-164
lines changed

5 files changed

+164
-164
lines changed

‎app/Resources/public/css/base.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ a.thumbnail:hover {
255255
}
256256

257257
.carousel-indicators {
258-
bottom: 0 !important;
258+
bottom: 0;
259259
}
260260

261261
.form-group .freeze {
@@ -3006,7 +3006,7 @@ table#skill_holder {
30063006
height: 4em;
30073007
opacity: 0.8;
30083008
padding-top: 0.9em;
3009-
/ text-align: center;
3009+
text-align: center;
30103010
width: 120px;
30113011
z-index: 40;
30123012
float: left;
@@ -6161,24 +6161,24 @@ div#chat-remote-video video {
61616161

61626162
.scroll-wrapper {
61636163
overflow: hidden !important;
6164-
padding: 0 !important;
6164+
padding: 0;
61656165
position: relative;
61666166
height: 300px;
61676167
}
61686168

61696169
.scroll-wrapper > .scroll-content {
61706170
border: none !important;
6171-
box-sizing: content-box !important;
6171+
box-sizing: content-box;
61726172
height: auto;
61736173
left: 0;
61746174
margin: 0;
61756175
max-height: none;
6176-
max-width: none !important;
6176+
max-width: none;
61776177
overflow: scroll !important;
61786178
padding: 0;
61796179
position: relative !important;
61806180
top: 0;
6181-
width: auto !important;
6181+
width: auto;
61826182

61836183
}
61846184

‎app/Resources/public/css/chat.css‎

Lines changed: 126 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,143 @@
1-
.page-chat{
2-
padding: 10px 0;
3-
background:#ffffff;
4-
}
5-
.message-form-chat .nav{
6-
margin-bottom: 0;
7-
}
8-
.message-form-chat .nav-tabs .active a{
9-
background-color: #f6f6f6;
10-
}
11-
12-
.message-student .chat-image, .message-teacher .chat-image{
13-
width: 80px;
14-
height: auto;
15-
max-height: 80px;
16-
display: inline-block;
17-
vertical-align: top;
18-
-webkit-border-radius: 10px;
19-
-moz-border-radius: 10px;
20-
border-radius: 10px;
21-
border:2px solid #fff;
22-
box-shadow: 1px 1px 2px rgba(0,0,0,0.2);
23-
}
24-
.message-student .content-message{
25-
background-color: #F9F2E0;
1+
.page-chat {
2+
padding: 10px 0;
3+
background: #ffffff;
4+
}
5+
6+
.message-form-chat .nav {
7+
margin-bottom: 0;
8+
}
9+
10+
.message-form-chat .nav-tabs .active a {
11+
background-color: #f6f6f6;
12+
}
13+
14+
.message-student .chat-image, .message-teacher .chat-image {
15+
width: 80px;
16+
height: auto;
17+
max-height: 80px;
18+
display: inline-block;
19+
vertical-align: top;
20+
-webkit-border-radius: 10px;
21+
-moz-border-radius: 10px;
22+
border-radius: 10px;
23+
border: 2px solid #fff;
24+
box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
25+
}
26+
27+
.message-student .content-message {
28+
background-color: #F9F2E0;
2629
color: #000;
27-
padding: 10px;
2830
margin-bottom: 15px;
29-
border-top: 1px solid #F9F2E0;
30-
border-left: 1px solid #F9F2E0;
31-
border-right: 2px solid #F7E5B9;
32-
border-bottom: 3px solid #F7E5B9;
31+
border: 1px solid #F9F2E0;
32+
border-right: 2px #F7E5B9;
33+
border-bottom: 3px #F7E5B9;
3334
border-radius: 10px;
35+
display: inline-block;
36+
font-size: 13px;
37+
padding: 15px;
38+
vertical-align: top;
39+
width: calc(100% - 100px);
40+
}
41+
42+
.message-teacher .icon-message {
43+
display: inline-block;
44+
margin-left: -6px;
45+
margin-top: 10px;
46+
width: 0;
47+
height: 0;
48+
border-top: 0 solid transparent;
49+
border-bottom: 15px solid transparent;
50+
border-left: 15px solid #EBEFF3;
51+
}
3452

35-
display: inline-block;
36-
font-size: 13px;
37-
padding: 15px;
38-
vertical-align: top;
39-
width: calc(100% - 100px);
40-
}
41-
.message-teacher .icon-message{
42-
display: inline-block;
43-
margin-left: -6px;
44-
margin-top: 10px;
45-
width: 0;
46-
height: 0;
47-
border-top: 0px solid transparent;
48-
border-bottom: 15px solid transparent;
49-
border-left: 15px solid #EBEFF3;
50-
}
51-
.message-student .icon-message{
52-
display: inline-block;
53-
margin-right: -6px;
54-
margin-top: 10px;
55-
width: 0;
56-
height: 0;
57-
border-top: 0px solid transparent;
58-
border-bottom: 15px solid transparent;
59-
border-right: 15px solid #F9F2E0;
60-
}
61-
.message-teacher .content-message{
62-
background-color: #EBEFF3;
53+
.message-student .icon-message {
54+
display: inline-block;
55+
margin-right: -6px;
56+
margin-top: 10px;
57+
width: 0;
58+
height: 0;
59+
border-top: 0 solid transparent;
60+
border-bottom: 15px solid transparent;
61+
border-right: 15px solid #F9F2E0;
62+
}
63+
64+
.message-teacher .content-message {
65+
background-color: #EBEFF3;
6366
color: #000;
64-
padding: 10px;
6567
margin-bottom: 15px;
66-
border-top: 1px solid #EBEFF3;
67-
border-left: 2px solid #DEE1E5;
68-
border-right: 1px solid #EBEFF3;
69-
border-bottom: 3px solid #DEE1E5;
68+
border: 1px solid #EBEFF3;
69+
border-bottom: 3px #DEE1E5;
70+
border-left: 2px #DEE1E5;
7071
border-radius: 10px;
71-
display: inline-block;
72-
font-size: 13px;
73-
padding: 15px;
74-
vertical-align: top;
75-
width: calc(100% - 100px);
76-
}
77-
.message-teacher .message-date{
78-
color: #666;
79-
font-style: italic;
80-
font-size: 10px;
81-
text-align: right;
82-
margin-right: 35px;
83-
margin-top: 10px;
84-
}
85-
.message-student .message-date{
86-
color: #666;
87-
font-style: italic;
88-
font-size: 10px;
89-
text-align: right;
90-
margin-top: 10px;
72+
display: inline-block;
73+
font-size: 13px;
74+
padding: 15px;
75+
vertical-align: top;
76+
width: calc(100% - 100px);
77+
}
78+
79+
.message-teacher .message-date {
80+
color: #666;
81+
font-style: italic;
82+
font-size: 10px;
83+
text-align: right;
84+
margin-right: 35px;
85+
margin-top: 10px;
86+
}
87+
88+
.message-student .message-date {
89+
color: #666;
90+
font-style: italic;
91+
font-size: 10px;
92+
text-align: right;
93+
margin-top: 10px;
9194
}
9295

9396
.chat-user {
94-
background-color: #EEEEEE;
95-
border: 1px solid #E2E2E2;
96-
-webkit-border-radius: 10px;
97-
-moz-border-radius: 10px;
98-
border-radius: 10px;
99-
color: #666;
100-
margin-bottom: 5px;
101-
padding: 10px;
102-
cursor: pointer;
97+
background-color: #EEEEEE;
98+
border: 1px solid #E2E2E2;
99+
border-radius: 10px;
100+
color: #666;
101+
margin-bottom: 5px;
102+
padding: 10px;
103+
cursor: pointer;
103104
}
105+
104106
.chat-user .user-image-chat {
105-
-webkit-border-radius: 10px;
106-
-moz-border-radius: 10px;
107-
border: 2px solid #FFF;
108-
border-radius: 10px;
109-
display: inline-block;
110-
height: auto;
111-
margin-right: 10px;
112-
max-height: 40px;
113-
float: left;
114-
width: 40px;
115-
}
116-
117-
.emoticons-chat img{
118-
width: 24px;
119-
border: none;
120-
}
121-
.message-form-chat{
122-
margin-top: 10px;
123-
padding: 5px;
124-
-webkit-border-radius: 10px;
125-
-moz-border-radius: 10px;
126-
border-radius: 10px;
127-
background: #EEEEEE;
107+
border: 2px solid #FFF;
108+
border-radius: 10px;
109+
display: inline-block;
110+
height: auto;
111+
margin-right: 10px;
112+
max-height: 40px;
113+
float: left;
114+
width: 40px;
115+
}
116+
117+
.emoticons-chat img {
118+
width: 24px;
119+
border: none;
120+
}
121+
122+
.message-form-chat {
123+
margin-top: 10px;
124+
padding: 5px;
125+
-webkit-border-radius: 10px;
126+
-moz-border-radius: 10px;
127+
border-radius: 10px;
128+
background: #EEEEEE;
128129
}
129130

130131
.emoji-menu {
131-
margin-left: -234px;
132-
margin-top: -224px;
133-
width: 468px;
132+
margin-left: -234px;
133+
margin-top: -224px;
134+
width: 468px;
134135
}
135136

136137
.emoji-wysiwyg-editor-preview,
137138
.emoji-wysiwyg-editor {
138139
padding: 3%;
139140
height: 50px;
140-
border: 0;
141141
background-color: #ffffff;
142142
-webkit-border-radius: 10px;
143143
-moz-border-radius: 10px;
@@ -147,18 +147,19 @@
147147
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35) inset;
148148
}
149149

150-
#chat-tabs .tab-content{
151-
margin-top: 15px;
150+
#chat-tabs .tab-content {
151+
margin-top: 15px;
152152
}
153153

154154
.chat-history {
155-
height: 400px;
156-
overflow: auto;
155+
height: 400px;
156+
overflow: auto;
157157
}
158158

159159
#chat-users {
160-
margin-left: 0;
160+
margin-left: 0;
161161
}
162+
162163
#chat-users div.chat-user > div {
163-
padding: 5px;
164+
padding: 5px;
164165
}

‎app/Resources/public/css/editor.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ body{
8888
}
8989
.ck-title2:after{
9090
background-color:#E95839;
91-
margin: 10px 0px 0px;
91+
margin: 10px 0 0;
9292
width: 50px;
9393
height: 2px;
9494
display: block;
@@ -100,17 +100,17 @@ figure .image.alignleft{
100100
margin: 0 20px 20px 0;
101101
}
102102
figure .image.alignright{
103-
margin: 0 20px 0px 20px;
103+
margin: 0 20px 0 20px;
104104
}
105105
figure .image{
106-
margin: 0 20px 0px 20px;
106+
margin: 0 20px 0 20px;
107107
}
108108
figure figcaption{
109109
text-align: left;
110110
background-color: #f3f3f3;
111-
padding-top: 0px;
112-
margin: 0px;
113-
border-radius: 0px;
111+
padding-top: 0;
112+
margin: 0;
113+
border-radius: 0;
114114
padding-left: 5px;
115115
}
116116
figure{

0 commit comments

Comments
 (0)