From c70592abbef3452e4f7f83301d662aa09e38e1d3 Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Mon, 28 Oct 2013 05:16:13 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20navba?= =?UTF-8?q?r=20=EA=B0=80=EB=A1=9C,=20=EC=84=B8=EB=A1=9C=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2636 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/webapp/index.html | 1 + src/main/webapp/styles/main.css | 43 ----------------------------- src/main/webapp/styles/navbar.css | 46 +++++++++++++++++++++++++++++++ src/main/webapp/views/navbar.html | 5 +++- 4 files changed, 51 insertions(+), 44 deletions(-) create mode 100644 src/main/webapp/styles/navbar.css diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 283862a0d..bd38e6000 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -31,6 +31,7 @@ + diff --git a/src/main/webapp/styles/main.css b/src/main/webapp/styles/main.css index ea8c459da..b0426a45a 100644 --- a/src/main/webapp/styles/main.css +++ b/src/main/webapp/styles/main.css @@ -27,49 +27,6 @@ canvas {outline:none} display: none; } -.main-navbar { - position: absolute; - margin: -40px 0 0 0; - height: 40px; - background-color: #252a3a; - width: 100%; - border-radius: 0; -} -.main-navbar .brand { - margin-left: 20px; -} -.main-navbar .nav>li { - margin-top: 5px; -} -.main-navbar .divider-vertical { - height: 35px; - min-height: 1px; - margin: 0 9px; - border: 0; -} -.navbar-form { - margin-bottom: 0; -} -.navbar-form .for-datetimepicker { - width:470px; -} -.navbar-form .datetimepicker { - margin: 0 0 0 1px; -} -.navbar-form .datetimepicker input[type="text"]{ - width: 140px; -} -.navbar-form .datetimepicker .checkbox input[type="checkbox"]{ - float: none; -} -.navbar-form .datetimepicker .icon-calendar { - margin-left: 1px; -} -#ui-datepicker-div { - font-size: 75%; - z-index: 10 !important; -} - .mt8 { margin-top: 8px; } diff --git a/src/main/webapp/styles/navbar.css b/src/main/webapp/styles/navbar.css new file mode 100644 index 000000000..63169ac08 --- /dev/null +++ b/src/main/webapp/styles/navbar.css @@ -0,0 +1,46 @@ +.main-navbar { + position: absolute; + margin: -40px 0 0 0; + height: 40px; + background-color: #252a3a; + width: 100%; + border-radius: 0; +} +.main-navbar .brand { + margin-left: 20px; +} +.main-navbar .nav>li { + margin-top: 5px; +} +.main-navbar .divider-vertical { + height: 35px; + min-height: 1px; + margin: 0 9px; + border: 0; +} +.navbar-form { + margin-bottom: 0; +} +.navbar-form .for-datetimepicker { + width:470px; +} +.navbar-form .datetimepicker { + margin: 0 0 0 1px; +} +.navbar-form .datetimepicker input[type="text"]{ + width: 146px; +} +.navbar-form .datetimepicker .checkbox input[type="checkbox"]{ + float: none; +} +.navbar-form .datetimepicker .icon-calendar { + margin-left: 1px; +} +#ui-datepicker-div { + font-size: 75%; + z-index: 10 !important; +} +.navbar .select2-container .select2-choice { + height: 28px; + line-height: 28px; +} \ No newline at end of file diff --git a/src/main/webapp/views/navbar.html b/src/main/webapp/views/navbar.html index f40fec19c..16c92afc4 100644 --- a/src/main/webapp/views/navbar.html +++ b/src/main/webapp/views/navbar.html @@ -38,7 +38,10 @@ 12h +