허진호 / cloud_computing_fileshell

Go to a project
Toggle navigation Toggle navigation pinning
허진호
aa2ca95c 1 parent 4f4e3dd8

Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev 

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
...@@ -109,12 +109,12 @@ body { ...@@ -109,12 +109,12 @@ body {
109 109
110 .frame_home { 110 .frame_home {
111 float:left; 111 float:left;
112 - width:80%; 112 + width:70%;
113 113
114 } 114 }
115 .frame { 115 .frame {
116 float:left; 116 float:left;
117 - width: 60%; 117 + width: 50%;
118 118
119 } 119 }
120 .container { 120 .container {
......