Преглед изворни кода

Merge branch 'master' of https://github.com/huguangju/FeHelper

huguangju пре 11 година
родитељ
комит
d72db42ce3

+ 1 - 2
chrome/static/css/fe-codebeautify.css

@@ -45,7 +45,6 @@ html {
     padding-top:0px;
 }
 .mod-code .btn-opts {
-    line-height: 30px;
     -webkit-user-select:none;
 }
 /* ref fe-endecode.css */
@@ -64,4 +63,4 @@ html {
 .-e-x-btn .-e-btn:hover {
     background: #fff;
 }
-/* ref fe-endecode.css END */
+/* ref fe-endecode.css END */

+ 42 - 0
chrome/static/css/fe-common.css

@@ -0,0 +1,42 @@
+.-e-x-container {
+    width:980px;
+    margin:0 auto;
+    padding:30px 0 50px 0;
+    min-height:400px;
+}
+.-e-x-radio label:hover {
+    color:#333;
+    cursor:pointer;
+}
+.-e-zxl-ta-src {
+    width:954px;
+    height:100px;
+}
+.-e-x-btn  {
+    height: 30px;
+    line-height: 30px;
+    margin-top: 10px;
+}
+.-e-x-btn .-e-x-radio {
+    float:left;
+    font-size:14px;
+}
+.-e-x-btn .-e-btn {
+    float:right;
+    height:30px;
+    width:70px;
+    font-size:13px;
+    padding:5px;
+    cursor:pointer;
+    background: #f1f1f1;
+    border: 1px solid #aaa;
+    color: #b00;
+}
+.-e-x-btn .-e-btn:hover {
+    background: #fff;
+}
+.-e-x-btn .-e-clear-btn {
+    margin-left:20px;
+    font-weight:normal;
+    color: #666;
+}

+ 0 - 43
chrome/static/css/fe-endecode.css

@@ -21,49 +21,6 @@ body{
 	padding:0 5px;
 	color:red;
 }
-
-.-e-x-container {
-	width:980px;
-	margin:0 auto;
-	padding:30px 0 50px 0;
-	min-height:400px;
-}
-.-e-x-radio label:hover {
-	color:#333;
-	cursor:pointer;
-}
-.-e-zxl-ta-src {
-	width:954px;
-	height:100px;
-}
-.-e-x-btn  {
-    height: 30px;
-    line-height: 30px;
-    margin-top: 10px;
-}
-.-e-x-btn .-e-x-radio {
-	float:left;
-	font-size:14px;
-}
-.-e-x-btn .-e-btn {
-	float:right;
-	height:30px;
-	width:70px;
-	font-size:13px;
-	padding:5px;
-	cursor:pointer;
-    background: #f1f1f1;
-    border: 1px solid #aaa;
-    color: #b00;
-}
-.-e-x-btn .-e-btn:hover {
-    background: #fff;
-}
-.-e-x-btn .-e-clear-btn {
-	margin-left:20px;
-	font-weight:normal;
-    color: #666;
-}
 .-e-x-rst {
     margin: 20px 0;
 	display:none;

+ 2 - 1
chrome/template/fehelper_codebeautify.html

@@ -4,6 +4,7 @@
         <title>代码美化工具</title>
         <meta charset="UTF-8">
         <link rel="stylesheet" href="../static/css/fe-codebeautify.css" />
+        <link rel="stylesheet" href="../static/css/fe-common.css" />
         <script type="text/javascript" src="../static/js/core/jquery-1.5.min.js"></script>
         <!-- syntaxhighlight -->
         <link type="text/css" rel="stylesheet" href="../static/js/syntaxhighlighter/styles/shCore.css"/>
@@ -21,7 +22,7 @@
                 <fieldset>
                     <legend>代码美化:<span id="codeTitle">Javascript</span></legend>
                     <textarea id="codeSource" placeholder="在这里粘贴您需要进行美化的代码"></textarea>
-                    <div class="btn-opts">
+                    <div class="btn-opts -e-x-btn">
                         <input id="codeTypeJs" name="codeType" type="radio" value="Javascript" checked>
                         <label for="codeTypeJs">JS代码美化</label>
                         <input id="codeTypeCss" name="codeType" type="radio" value="CSS">

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
chrome/template/fehelper_endecode.html


+ 2 - 1
chrome/template/fehelper_jsonformat.html

@@ -4,12 +4,13 @@
         <title>Json格式化查看工具</title>
         <meta charset="UTF-8">
         <link rel="stylesheet" href="../static/css/fe-jsonformat.css" />
+        <link rel="stylesheet" href="../static/css/fe-common.css" />
         <script type="text/javascript" src="../static/js/core/jquery-1.5.min.js"></script>
 		<script type="text/javascript" src="../static/js/mod/mod_jsonformat.js"></script>
     </head>
     <body>
         <div class="mod-json">
-            <div class="format-item clearfix">
+            <div class="format-item clearfix -e-x-btn">
                 <fieldset>
                     <legend>JSON格式化查看:请在下面粘贴你的JSON字符串</legend>
                     <textarea id="jsonSource" placeholder="在这里粘贴您需要进行格式化的JSON代码"></textarea>

Неке датотеке нису приказане због велике количине промена