Merge branch 'master' into develop

JeongChanwoo · Nov 7, 2018 · ca34b27 · ca34b27
2 parents 22a819e + 748617f
commit ca34b27
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 18 deletions.
diff --git a/code/css/git_page.css b/code/css/git_page.css
@@ -218,6 +218,55 @@ div.footer ul li{
 
 a:link {text-decoration: none;}
 a:hover {color: blue; text-decoration: underline;}
+.code_activity{
+  width:100%;
+  box-shadow: inset 0px 8px 10px -10px #A4A4A4;
+  border-top-right-radius:3px;
+  border-bottom-right-radius:5px;
+  border-right: 2px solid #FF4000;
+  height: 7%;
+}
+
+.table_middle{
+  width:100%;
+  box-shadow: inset 10px 8px 10px -10px #A4A4A4;
+  height: 14%;
+}
+.table_bottom{
+  width:100%;
+  box-shadow: inset 10px 8px 10px -10px #A4A4A4;
+  height: 14%;
+
+}
+.middle_address{
+  width:50%;
+  border-radius: 3px;
+  box-shadow: inset 0 0 10px #A4A4A4;
+}
+.bottom_clone{
+  width:100%;
+    height:4%;
+  border-radius: 3px;
+  box-shadow: inset 0 0 10px #A4A4A4;
+}
+.bottom_zip{
+  width:100%;
+  height:4%;
+  border-radius: 3px;
+  box-shadow: inset 0 0 10px #A4A4A4;
+}
+.table_middle tr th.number{
+
+  border-radius:100px;
+  background-color: #E6E6E6;
+
+  text-align: center;
+}
+
+.side_bar{
+  margin: 20px;
+}
+
 
 
 

diff --git a/code/html/README.md b/code/html/README.md
@@ -40,9 +40,10 @@
         - div class(content)
   - side bar(소연)
     - table class(top_table)
-      - div class(code_activity)
-      - div class(table_middle)
-      - div class(table_bottom)
+      - table class(code_activity)
+      - table class(table_middle)
+        - class(number)
+      - table class(table_bottom)
     - div class(middle)
       - p class(middle_title)
       - table class(middle_address)

diff --git a/code/html/git_page.html b/code/html/git_page.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
+
   <head>
     <meta charset="utf-8">
     <link rel="stylesheet" href="../css/git_page.css">
@@ -164,46 +165,46 @@ <h1>KnowRe web devlopment curriculum</br>2016<h1>
       <div class = "side_bar">
         <!-- 소연 side bar 파트 작성 영역 -->
         <table class = "top_table">
-          <div class = "code_activity">
+          <table class = "code_activity">
 
               <tr align="left">
 
-                <th><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>Code</a></th>
+                <th><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M9.5 3L8 4.5 11.5 8 8 11.5 9.5 13 14 8 9.5 3zm-5 0L0 8l4.5 5L6 11.5 2.5 8 6 4.5 4.5 3z"/></svg>&nbsp;Code</a></th>
 
               </tr>
-           </div>
-           <div class = "table_middle">
+           </table>
+           <table class = "table_middle">
 
               <tr>
 
-                <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg>Issues</a></th>
+                <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg>&nbsp;Issues</a></th>
 
-                <th align="right"><a href='/'>0</a></th>
+                <th class="number" align="right"><a href='/'>0</a></th>
 
               </tr>
 
               <tr>
 
-                <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>Pull requests</a></th>
+                <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="12" height="16" viewBox="0 0 12 16"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0 0 10 15a1.993 1.993 0 0 0 1-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v6.56A1.993 1.993 0 0 0 2 15a1.993 1.993 0 0 0 1-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg>&nbsp;Pull requests</a></th>
 
-                <th align="right"><a href='/'>0</a></th>
+                <th class="number" align="right" ><a href='/'>0</a></th>
               </tr>
-            </div>
+            </table>
 
-            <div class = "table_bottom">
+            <table class = "table_bottom">
 
                 <tr>
 
-                  <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M11.5 8L8.8 5.4 6.6 8.5 5.5 1.6 2.38 8H0v2h3.6l.9-1.8.9 5.4L9 8.5l1.6 1.5H14V8h-2.5z"/></svg>Pulse</a></th>
+                  <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path fill-rule="evenodd" d="M11.5 8L8.8 5.4 6.6 8.5 5.5 1.6 2.38 8H0v2h3.6l.9-1.8.9 5.4L9 8.5l1.6 1.5H14V8h-2.5z"/></svg>&nbsp;Pulse</a></th>
 
                 </tr>
 
                 <tr>
 
-                  <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z"/></svg>Graphs</a></th>
+                  <th align="left"><a href='/'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M16 14v1H0V0h1v14h15zM5 13H3V8h2v5zm4 0H7V3h2v10zm4 0h-2V6h2v7z"/></svg>&nbsp;Graphs</a></th>
 
                 </tr>
-            </div>
+            </table>
 
         </table>
 
@@ -228,9 +229,9 @@ <h1>KnowRe web devlopment curriculum</br>2016<h1>
 
         <div class = bottom>
 
-          <p class= bottom_clone><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"/></svg>Clone in Desdtop</p>
+          <p class= bottom_clone align='middle'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M4 6h3V0h2v6h3l-4 4-4-4zm11-4h-4v1h4v8H1V3h4V2H1c-.55 0-1 .45-1 1v9c0 .55.45 1 1 1h5.34c-.25.61-.86 1.39-2.34 2h8c-1.48-.61-2.09-1.39-2.34-2H15c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1z"/></svg>Clone in Desdtop</p>
 
-          <p class= bottom_zip><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9 12h2l-3 3-3-3h2V7h2v5zm3-8c0-.44-.91-3-4.5-3C5.08 1 3 2.92 3 5 1.02 5 0 6.52 0 8c0 1.53 1 3 3 3h3V9.7H3C1.38 9.7 1.3 8.28 1.3 8c0-.17.05-1.7 1.7-1.7h1.3V5c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V11h2c2.08 0 4-1.16 4-3.5C16 5.06 14.08 4 12 4z"/></svg>Download ZIP</p>
+          <p class= bottom_zip align='middle'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M9 12h2l-3 3-3-3h2V7h2v5zm3-8c0-.44-.91-3-4.5-3C5.08 1 3 2.92 3 5 1.02 5 0 6.52 0 8c0 1.53 1 3 3 3h3V9.7H3C1.38 9.7 1.3 8.28 1.3 8c0-.17.05-1.7 1.7-1.7h1.3V5c0-1.39 1.56-2.7 3.2-2.7 2.55 0 3.13 1.55 3.2 1.8v1.2H12c.81 0 2.7.22 2.7 2.2 0 2.09-2.25 2.2-2.7 2.2h-2V11h2c2.08 0 4-1.16 4-3.5C16 5.06 14.08 4 12 4z"/></svg>Download ZIP</p>
 
         </div>
       </div>