Merge branch 'fixbug' into dev

ykxie
2 parents ce41e937 d85dc06d
Showing 4 changed files with 31 additions and 19 deletions
src/css/main.css
src/css/recording.css
src/player.html
src/scss/recording.scss
@@ -30,16 +30,7 @@
     border: none;
     border-bottom: 1px solid #ddd;
 }
-// input[type="button"]{
-//     min-width: 6em;
-//     background-image: none;
-//     background-color: #1FB6FF;
-//     border: none;
-//     padding: 1em .8em;
-//     color: #fff;
-//     outline: none;
-//     line-height: 1.428571429;
-// }
+
 input[disabled]{
     color: rgb(84, 84, 84);
     background-color: #a8b8bf;
@@ -301,8 +301,8 @@ button {
   margin-right: 0;
   line-height: 1.428571429;
   border: none !important;
-  height: 42px;
-  line-height: 42px;
+  height: 34px;
+  line-height: 34px;
   padding: 0;
   border-radius: 21px; }
@@ -15,7 +15,7 @@
     <link href="css/recording.css" rel="stylesheet">
     <script>
-        var gxb_api = "https://restful.gaoxiaobang.com";
+        var gxb_api = "https://restful1.gaoxiaobang.com";
         // var gxb_api = "https://restful.gaoxiaobang.com"
     </script>
@@ -76,13 +76,11 @@
                         <div class="recording-header">
                             <ul class="nav nav-tabs pull-left" id="recordertab">
                                 <li style="margin-left: 34px;">
-                                    <a href="#replayzone" data-toggle="tab">
-                                        <span class="glyphicon glyphicon-play"></span><p class="hidden-xs hidden-sm pull-right">&nbsp;课程预览区</p>
-                                    </a>
+                                    <a href="#replayzone" data-toggle="tab"></a>
                                 </li>
                             </ul>
                             <div id="editorwrapper">
-                                <button type="button" class="lang btn btn-default btn-primary pull-right" id="htmlbutton" title="" data-editorname="html"></button>
+                                <button type="button" class="lang btn btn-default btn-primary pull-right" id="htmlbutton" title="" data-editorname="html">HTML/CSS/JS</button>
                             </div>
                         </div>
                     </div>
@@ -36,6 +36,29 @@ button{
         padding-left: 0;
         padding-right: 0;
     }
+
+    // .recording-wrap{
+
+    //     .recording-header{
+    //         height: 36px;
+    //     }
+    //     .lang{
+    //         padding: 4px 24px;
+    //         margin: 3px 16px;
+    //     }
+    // }
+    // .nav-tabs > li > a{
+    //     height: 36px;
+    //     line-height: 1px;
+    // }
+    // .panel-default > .panel-heading{
+    //     height: 36px;
+    //     line-height: 18px;
+
+    // }
+    // .panel-heading{
+    //     padding: 8px 16px;
+    // }
 }
 .upload-tip{
@@ -373,8 +396,8 @@ button{
         margin-right: 0;
         line-height: 1.428571429;
         border: none !important;
-        height: 42px;
-        line-height: 42px;
+        height: 34px;
+        line-height: 34px;
         padding: 0;
         border-radius: 21px;
     }