fix css for firefox (#18)

RouxRC · May 8, 2017 · 7f842fa · 7f842fa
1 parent d853572
commit 7f842fa
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 20 deletions.
diff --git a/web/css/webmonitor.css b/web/css/webmonitor.css
@@ -28,6 +28,7 @@ h1 {
   display: block;
   float:left;
   border-bottom: 1px solid darkgrey;
+  border-radius: 1px;
   cursor: pointer;
   font-size: 12px;
   font-weight: bold;
@@ -52,14 +53,19 @@ h1 {
 .expand {
   position: fixed;
   right: 11px;
-  width: 18px;
+  width: 20px;
   background-color: #ebd9fb;
-  font-size: 12px;
+  font-size: 15px;
   border-left: 1px solid darkgrey;
   border-bottom: 1px solid darkgrey;
+  border-radius: 10%;
   cursor: pointer;
   display: block;
 }
+#selecter .expand {
+  font-size: 12px;
+  width: 17px;
+}
 #selecter .expand .glyphicon {
   top: 2px;
 }
@@ -84,26 +90,67 @@ h1 {
 .version, .title p {
   margin: auto;
   width: 100%;
-  height: 18px;
+  height: 22px;
   display: block;
   text-align: center;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: bold;
+  line-height: 1.8;
   float: left;
   background-color: #eafaff;
 }
 .version {
   border-bottom: 1px solid darkgrey;
 }
 .version a span {
-  font-size: 11px;
+  font-size: 12px;
+}
+input[type=radio] {
+  display: none;
+}
+label {
+  display: inline-block;
+  position: relative;
+  cursor: pointer;
+  padding: 0px;
+  margin-left: 30px;
 }
-input[name=curwin] {
+label:before {
+  content: "";
+  display: inline-block;
   position: absolute;
-  margin: 2px;
+  top: -2px;
+  left: -25px;
+  width: 14px;
+  height: 14px;
+  margin: 5px 0px 0px 5px;
+  background-color: #CCC;
+  border: 2px solid #6f6fad;
+  border-radius: 50%;
+}
+label:after {
+  content: "";
+  display: inline-block;
+  position: absolute;
+  width: 0;
+  height: 0;
+  top: 7px;
+  left: -16px;
+  margin: 0;
+  background: #6f6fad;
+  border-radius: 50%;
+  z-index: 1;
 }
-.copy input[name=curwin] {
-  right: 50%;
+:checked + label:after {
+  height: 6px;
+  width: 6px;
+}
+.copy label {
+  float: right;
+}
+.orig label {
+  float: left;
+  left: -4px;
 }
 .title {
   clear: both;
@@ -119,11 +166,13 @@ input[name=curwin] {
   margin: 2px 2px 2px 8px;
 }
 #fullshots {
-  overflow: overlay;
+  overflow: auto;
   clear: both;
 }
 #fullshots img {
   float: left;
+  width: 50%;
+  border: 3px solid lightgrey;
 }
 #iframes .orig, #iframes .copy {
   display: none;

diff --git a/web/js/webmonitor.js b/web/js/webmonitor.js
@@ -194,9 +194,9 @@
     $("#screenshots img").width(imgW - 8);
     ns.diffHeight = winH - ns.selecterHeight - 57;
     ns.selecterMaxHeight = winH - 50;
-    ns.pieceHeight = (ns.diffHeight - 18 * 4) / 3;
+    ns.pieceHeight = (ns.diffHeight - 22 * 4) / 3;
     $(".differ").width(winW - 10);
-    $(".copy iframe, .orig iframe, #fullshots img").width((winW - 3) / 2);
+    $(".copy iframe, .orig iframe").width((winW - 3) / 2);
     $("#diff").height(ns.diffHeight);
     ns.resetDiffHeights();
   };

diff --git a/web/templates/monitor.html b/web/templates/monitor.html
@@ -29,35 +29,37 @@ <h1>
     </ul>
     <div id="diff">
       <div class="copy">
-        <input type="radio" name="curwin" value="copy" checked />
         <p class="version">
           <span class="name"></span>
           <a target="_blank"><span class="glyphicon glyphicon-link"></span></a>
+          <input id="curwin-c" type="radio" name="curwin" value="copy" checked />
+          <label for="curwin-c"></label>
         </p>
       </div>
       <div class="orig">
-        <input type="radio" name="curwin" value="orig" />
         <p class="version">
+          <input id="curwin-o" type="radio" name="curwin" value="orig" />
+          <label for="curwin-o"></label>
           <span class="name"></span>
           <a target="_blank"><span class="glyphicon glyphicon-link"></span></a>
         </p>
       </div>
       <div id="visual" class="title">
         <p>
           <span>VISUAL
-            <input type="radio" name="visual" value="screen" checked /> screenshots
-            <input type="radio" name="visual" value="iframe" /> iframe
+            <input id="visual-s" type="radio" name="visual" value="screen" checked />
+            <label for="visual-s">screenshots</label>
+            <input id="visual-i" type="radio" name="visual" value="iframe" />
+            <label for="visual-i">iframe</label>
           </span>
         </p>
         <div class="expand" title="Expand">
           <span class="glyphicon glyphicon-resize-full"></span>
         </div>
       </div>
       <div id="fullshots">
-        <div>
-          <img id="screencopy"/>
-          <img id="screenorig"/>
-        </div>
+        <img id="screencopy"/>
+        <img id="screenorig"/>
       </div>
       <div id="iframes">
         <div class="copy">