Browse Source

ref(css): move aui css to jitsi-meet

master
Leonard Kim 7 years ago
parent
commit
b258a9fc5e
10 changed files with 876 additions and 7727 deletions
  1. 0
    3
      app.js
  2. 230
    0
      css/_aui_reset.scss
  3. 3
    0
      css/_base.scss
  4. 5
    1
      css/_utils.scss
  5. 1
    0
      css/main.scss
  6. 64
    4
      css/modals/_dialog.scss
  7. 572
    7699
      package-lock.json
  8. 0
    3
      package.json
  9. 0
    3
      react/features/device-selection/popup.js
  10. 1
    14
      webpack.config.js

+ 0
- 3
app.js View File

11
 import 'jQuery-Impromptu';
11
 import 'jQuery-Impromptu';
12
 import 'autosize';
12
 import 'autosize';
13
 
13
 
14
-import 'aui-css';
15
-import 'aui-experimental-css';
16
-
17
 import conference from './conference';
14
 import conference from './conference';
18
 import API from './modules/API';
15
 import API from './modules/API';
19
 import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
16
 import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';

+ 230
- 0
css/_aui_reset.scss View File

1
+/* Fonts and line heights */
2
+/**
3
+ * RESET
4
+ */
5
+html,
6
+body,
7
+p,
8
+div,
9
+h1,
10
+h2,
11
+h3,
12
+h4,
13
+h5,
14
+h6,
15
+img,
16
+pre,
17
+form,
18
+fieldset {
19
+  margin: 0;
20
+  padding: 0;
21
+}
22
+ul,
23
+ol,
24
+dl {
25
+  margin: 0;
26
+}
27
+img,
28
+fieldset {
29
+  border: 0;
30
+}
31
+@-moz-document url-prefix() {
32
+  img {
33
+    font-size: 0;
34
+  }
35
+  img:-moz-broken {
36
+    font-size: inherit;
37
+  }
38
+}
39
+/* https://github.com/necolas/normalize.css */
40
+/* Customised to remove styles for unsupported browsers */
41
+details,
42
+main,
43
+summary {
44
+  display: block;
45
+}
46
+audio,
47
+canvas,
48
+progress,
49
+video {
50
+  display: inline-block;
51
+  vertical-align: baseline;
52
+}
53
+audio:not([controls]) {
54
+  display: none;
55
+  height: 0;
56
+}
57
+[hidden],
58
+template {
59
+  display: none;
60
+}
61
+input[type="button"],
62
+input[type="submit"],
63
+input[type="reset"] {
64
+  -webkit-appearance: button;
65
+}
66
+/**
67
+ * TYPOGRAPHY - 14px base font size, agnostic font stack
68
+ */
69
+body {
70
+  color: #333;
71
+  font-family: Arial, sans-serif;
72
+  font-size: 14px;
73
+  line-height: 1.42857142857143;
74
+}
75
+/* International Font Stacks*/
76
+[lang|=en] {
77
+  font-family: Arial, sans-serif;
78
+}
79
+[lang|=ja] {
80
+  font-family: "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ Pro W3", "メイリオ", Meiryo, "MS Pゴシック", Verdana, Arial, sans-serif;
81
+}
82
+/* Default margins */
83
+p,
84
+ul,
85
+ol,
86
+dl,
87
+h1,
88
+h2,
89
+h3,
90
+h4,
91
+h5,
92
+h6,
93
+blockquote,
94
+pre {
95
+  margin: 10px 0 0 0;
96
+}
97
+/* No top margin to interfere with box padding */
98
+p:first-child,
99
+ul:first-child,
100
+ol:first-child,
101
+dl:first-child,
102
+h1:first-child,
103
+h2:first-child,
104
+h3:first-child,
105
+h4:first-child,
106
+h5:first-child,
107
+h6:first-child,
108
+blockquote:first-child,
109
+pre:first-child {
110
+  margin-top: 0;
111
+}
112
+/* Headings: desired line height in px / font size = unitless line height */
113
+h1 {
114
+  color: #333;
115
+  font-size: 32px;
116
+  font-weight: normal;
117
+  line-height: 1.25;
118
+  text-transform: none;
119
+  margin: 30px 0 0 0;
120
+}
121
+h2 {
122
+  color: #333;
123
+  font-size: 24px;
124
+  font-weight: normal;
125
+  line-height: 1.25;
126
+  text-transform: none;
127
+  margin: 30px 0 0 0;
128
+}
129
+h3 {
130
+  color: #333;
131
+  font-size: 20px;
132
+  font-weight: normal;
133
+  line-height: 1.5;
134
+  text-transform: none;
135
+  margin: 30px 0 0 0;
136
+}
137
+h4 {
138
+  color: #333;
139
+  font-size: 16px;
140
+  font-weight: bold;
141
+  line-height: 1.25;
142
+  text-transform: none;
143
+  margin: 20px 0 0 0;
144
+}
145
+h5 {
146
+  color: #333;
147
+  font-size: 14px;
148
+  font-weight: bold;
149
+  line-height: 1.42857143;
150
+  text-transform: none;
151
+  margin: 20px 0 0 0;
152
+}
153
+h6 {
154
+  color: #707070;
155
+  font-size: 12px;
156
+  font-weight: bold;
157
+  line-height: 1.66666667;
158
+  text-transform: uppercase;
159
+  margin: 20px 0 0 0;
160
+}
161
+h1:first-child,
162
+h2:first-child,
163
+h3:first-child,
164
+h4:first-child,
165
+h5:first-child,
166
+h6:first-child {
167
+  margin-top: 0;
168
+}
169
+/* Nice styles for using subheadings */
170
+h1 + h2,
171
+h2 + h3,
172
+h3 + h4,
173
+h4 + h5,
174
+h5 + h6 {
175
+  margin-top: 10px;
176
+}
177
+
178
+
179
+/* Other typographical elements */
180
+small {
181
+  color: #707070;
182
+  font-size: 12px;
183
+  line-height: 1.33333333333333;
184
+}
185
+code,
186
+kbd {
187
+  font-family: monospace;
188
+}
189
+var,
190
+address,
191
+dfn,
192
+cite {
193
+  font-style: italic;
194
+}
195
+cite:before {
196
+  content: "\2014 \2009";
197
+}
198
+blockquote {
199
+  border-left: 1px solid #ccc;
200
+  color: #707070;
201
+  margin-left: 19px;
202
+  padding: 10px 20px;
203
+}
204
+blockquote > cite {
205
+  display: block;
206
+  margin-top: 10px;
207
+}
208
+q {
209
+  color: #707070;
210
+}
211
+q:before {
212
+  content: open-quote;
213
+}
214
+q:after {
215
+  content: close-quote;
216
+}
217
+abbr {
218
+  border-bottom: 1px #707070 dotted;
219
+  cursor: help;
220
+}
221
+
222
+a {
223
+  color: #3572b0;
224
+  text-decoration: none;
225
+}
226
+a:focus,
227
+a:hover,
228
+a:active {
229
+  text-decoration: underline;
230
+}

+ 3
- 0
css/_base.scss View File

123
 * Dialogs fade
123
 * Dialogs fade
124
 */
124
 */
125
 .aui-blanket {
125
 .aui-blanket {
126
+    background: #000;
127
+    transition: opacity 0.2s, visibility 0.2s;
128
+    transition-delay: 0.1s;
126
     visibility: visible;
129
     visibility: visible;
127
 }
130
 }
128
 
131
 

+ 5
- 1
css/_utils.scss View File

35
     display: -ms-flexbox !important;
35
     display: -ms-flexbox !important;
36
     display: -webkit-flex !important;
36
     display: -webkit-flex !important;
37
     display: flex !important;
37
     display: flex !important;
38
-}
38
+}
39
+
40
+.hidden {
41
+  display: none;
42
+}

+ 1
- 0
css/main.scss View File

33
 /* Modules BEGIN */
33
 /* Modules BEGIN */
34
 
34
 
35
 @import 'dial-out';
35
 @import 'dial-out';
36
+@import 'aui_reset';
36
 @import 'base';
37
 @import 'base';
37
 @import 'utils';
38
 @import 'utils';
38
 @import 'overlay/overlay';
39
 @import 'overlay/overlay';

+ 64
- 4
css/modals/_dialog.scss View File

1
 .dialog {
1
 .dialog {
2
-    visibility: visible;
2
+    box-sizing: border-box;
3
     height: auto;
3
     height: auto;
4
+    min-height: 131px;
5
+    overflow: visible;
6
+    visibility: visible;
7
+    width: 400px;
4
 
8
 
5
     h1, h2, h3, h4, h5, h6 {
9
     h1, h2, h3, h4, h5, h6 {
6
         color: $auiDialogColor;
10
         color: $auiDialogColor;
10
 
14
 
11
         &-icon {
15
         &-icon {
12
             color: $auiDialogColor;
16
             color: $auiDialogColor;
17
+            text-indent: -999em;
13
 
18
 
14
             &-small {
19
             &-small {
15
                 width: 14px;
20
                 width: 14px;
16
                 height: 14px;
21
                 height: 14px;
22
+
23
+                &:before {
24
+                    color: inherit;
25
+                    font-family: "FontAwesome";
26
+                    font-size: 16px;
27
+                    -webkit-font-smoothing: antialiased;
28
+                    font-style: normal;
29
+                    font-weight: normal;
30
+                    left: 0;
31
+                    line-height: 1;
32
+                    margin-top: -8px;
33
+                    position: absolute;
34
+                    text-indent: 0;
35
+                    speak: none;
36
+                    top: 50%;
37
+                }
17
             }
38
             }
18
         }
39
         }
19
 
40
 
22
             right: 20px;
43
             right: 20px;
23
             position: absolute;
44
             position: absolute;
24
             top: -49px;
45
             top: -49px;
46
+
47
+            &:before {
48
+                content: "\f00d";
49
+            }
25
         }
50
         }
26
 
51
 
27
         &-dialog2 {
52
         &-dialog2 {
31
             }
56
             }
32
 
57
 
33
             &-header {
58
             &-header {
34
-                height: em(58, 12);
35
                 border-bottom: 1px solid $auiBorderColor;
59
                 border-bottom: 1px solid $auiBorderColor;
60
+                border-radius: 5px 5px 0 0;
61
+                box-sizing: border-box;
62
+                color: #333;
63
+                display: table;
64
+                font-weight: normal;
65
+                height: em(58, 12);
66
+                margin-top: -69px;
67
+                padding: 0 20px;
68
+                width: 100%;
36
 
69
 
37
                 h2 {
70
                 h2 {
38
                     font-size: em(20, 12);
71
                     font-size: em(20, 12);
41
                 }
74
                 }
42
 
75
 
43
                 &-main {
76
                 &-main {
77
+                    display: table-cell;
44
                     padding-right: 0;
78
                     padding-right: 0;
79
+                    max-width: 400px;
80
+                    overflow: hidden;
81
+                    text-overflow: ellipsis;
82
+                    vertical-align: middle;
83
+                    white-space: nowrap;
84
+
45
                 }
85
                 }
46
             }
86
             }
47
 
87
 
48
             &-footer {
88
             &-footer {
49
                 border-top: 1px solid $auiBorderColor;
89
                 border-top: 1px solid $auiBorderColor;
90
+                border-radius: 0 0 5px 5px;
91
+                box-sizing: border-box;
92
+                height: 51px;
93
+                overflow: hidden;
94
+                padding: 10px 20px;
95
+                width: 100%;
96
+
97
+                &:empty {
98
+                    height: 5px;
99
+                    padding: 0;
100
+                }
50
             }
101
             }
51
 
102
 
52
             &-content {
103
             &-content {
53
-                font-size: em(14, 12);
54
-                min-height: 0;
55
                 background-color: $auiDialogContentBg;
104
                 background-color: $auiDialogContentBg;
105
+                box-sizing: border-box;
56
                 color: $auiDialogColor;
106
                 color: $auiDialogColor;
107
+                font-size: em(14, 12);
108
+                overflow: auto;
109
+                max-height: 100%;
110
+                padding: 20px;
57
 
111
 
58
                 p,span, h3 {
112
                 p,span, h3 {
59
                     font-weight: $labelFontWeight;
113
                     font-weight: $labelFontWeight;
77
     }
131
     }
78
 }
132
 }
79
 
133
 
134
+@media all and (max-width: 420px) {
135
+  .aui-dialog2-small .aui-dialog2-content {
136
+    height: 100%;
137
+  }
138
+}
139
+
80
 .modal-dialog-form {
140
 .modal-dialog-form {
81
     color: $modalTextColor;
141
     color: $modalTextColor;
82
     margin-top: 5px !important;
142
     margin-top: 5px !important;

+ 572
- 7699
package-lock.json
File diff suppressed because it is too large
View File


+ 0
- 3
package.json View File

31
     "@atlaskit/tabs": "4.0.1",
31
     "@atlaskit/tabs": "4.0.1",
32
     "@atlaskit/theme": "2.2.0",
32
     "@atlaskit/theme": "2.2.0",
33
     "@atlaskit/tooltip": "6.0.0",
33
     "@atlaskit/tooltip": "6.0.0",
34
-    "@atlassian/aui": "6.0.6",
35
     "autosize": "1.18.13",
34
     "autosize": "1.18.13",
36
     "es6-iterator": "2.0.3",
35
     "es6-iterator": "2.0.3",
37
     "es6-symbol": "3.1.1",
36
     "es6-symbol": "3.1.1",
114
     "lint"
113
     "lint"
115
   ],
114
   ],
116
   "browser": {
115
   "browser": {
117
-    "aui-css": "./node_modules/@atlassian/aui/dist/aui/css/aui.min.css",
118
-    "aui-experimental-css": "./node_modules/@atlassian/aui/dist/aui/css/aui-experimental.min.css",
119
     "autosize": "./node_modules/autosize/build/jquery.autosize.js",
116
     "autosize": "./node_modules/autosize/build/jquery.autosize.js",
120
     "jQuery-Impromptu": "jQuery-Impromptu/src/jquery-impromptu.js"
117
     "jQuery-Impromptu": "jQuery-Impromptu/src/jquery-impromptu.js"
121
   }
118
   }

+ 0
- 3
react/features/device-selection/popup.js View File

1
 /* global JitsiMeetJS */
1
 /* global JitsiMeetJS */
2
 
2
 
3
-import 'aui-css';
4
-import 'aui-experimental-css';
5
-
6
 // FIXME: remove once atlaskit work with React 16.
3
 // FIXME: remove once atlaskit work with React 16.
7
 import '../base/react/prop-types-polyfill.js';
4
 import '../base/react/prop-types-polyfill.js';
8
 
5
 

+ 1
- 14
webpack.config.js View File

4
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
4
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
5
 const webpack = require('webpack');
5
 const webpack = require('webpack');
6
 
6
 
7
-const auiCSS = `${__dirname}/node_modules/@atlassian/aui/dist/aui/css/`;
8
-
9
 /**
7
 /**
10
  * The URL of the Jitsi Meet deployment to be proxy to in the context of
8
  * The URL of the Jitsi Meet deployment to be proxy to in the context of
11
  * development with webpack-dev-server.
9
  * development with webpack-dev-server.
87
         }, {
85
         }, {
88
             // Expose jquery as the globals $ and jQuery because it is expected
86
             // Expose jquery as the globals $ and jQuery because it is expected
89
             // to be available in such a form by multiple jitsi-meet
87
             // to be available in such a form by multiple jitsi-meet
90
-            // dependencies including AUI, lib-jitsi-meet.
88
+            // dependencies including lib-jitsi-meet.
91
 
89
 
92
             loader: 'expose-loader?$!expose-loader?jQuery',
90
             loader: 'expose-loader?$!expose-loader?jQuery',
93
             test: /\/node_modules\/jquery\/.*\.js$/
91
             test: /\/node_modules\/jquery\/.*\.js$/
104
                 'style-loader',
102
                 'style-loader',
105
                 'css-loader'
103
                 'css-loader'
106
             ]
104
             ]
107
-        }, {
108
-            // Emit the static assets of AUI such as images that are referenced
109
-            // by CSS into the output path.
110
-
111
-            include: auiCSS,
112
-            loader: 'file-loader',
113
-            options: {
114
-                context: auiCSS,
115
-                name: '[path][name].[ext]'
116
-            },
117
-            test: /\.(gif|png|svg)$/
118
         } ]
105
         } ]
119
     },
106
     },
120
     node: {
107
     node: {

Loading…
Cancel
Save