From 2f3a3dddd67ce75271adc2e896a467a1d29bd2bc Mon Sep 17 00:00:00 2001 From: benweet Date: Tue, 3 Sep 2013 23:57:34 +0100 Subject: [PATCH] Upgrade to Bootstrap 3 --- cache.manifest | 2 +- res-min/themes/blue-gray.css | 2 +- res-min/themes/default.css | 2 +- res-min/themes/night.css | 2 +- res/styles/main.less | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cache.manifest b/cache.manifest index dc6a43ea..162171b6 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Tue Sep 03 2013 23:44:13 +#Date Tue Sep 03 2013 23:57:09 CACHE: index.html diff --git a/res-min/themes/blue-gray.css b/res-min/themes/blue-gray.css index f5915dbb..663aec38 100644 --- a/res-min/themes/blue-gray.css +++ b/res-min/themes/blue-gray.css @@ -1378,7 +1378,7 @@ body{tab-size:4} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#edf1f3;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e1e7eb;border-top:0;border-radius:6px} .document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;line-height:10px;margin-left:-30px;margin-top:2px;padding:0 8px 4px;font-weight:normal;height:34px} +.document-panel .search-bar .close{line-height:10px;margin:2px 0 2px -30px;padding:0 8px 4px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#545454;font-size:15px;border-bottom-color:#edf1f3} .document-panel .list-group{margin:0} diff --git a/res-min/themes/default.css b/res-min/themes/default.css index 584d5166..33aeaaa6 100644 --- a/res-min/themes/default.css +++ b/res-min/themes/default.css @@ -1378,7 +1378,7 @@ body{tab-size:4} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#f1f1f1;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e7e7e7;border-top:0;border-radius:6px} .document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;line-height:10px;margin-left:-30px;margin-top:2px;padding:0 8px 4px;font-weight:normal;height:34px} +.document-panel .search-bar .close{line-height:10px;margin:2px 0 2px -30px;padding:0 8px 4px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#545454;font-size:15px;border-bottom-color:#f1f1f1} .document-panel .list-group{margin:0} diff --git a/res-min/themes/night.css b/res-min/themes/night.css index 2e183a63..c442d52d 100644 --- a/res-min/themes/night.css +++ b/res-min/themes/night.css @@ -1378,7 +1378,7 @@ body{tab-size:4} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#232323;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #323232;border-top:0;border-radius:6px} .document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;line-height:10px;margin-left:-30px;margin-top:2px;padding:0 8px 4px;font-weight:normal;height:34px} +.document-panel .search-bar .close{line-height:10px;margin:2px 0 2px -30px;padding:0 8px 4px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#dedede;font-size:15px;border-bottom-color:#444444} .document-panel .list-group{margin:0} diff --git a/res/styles/main.less b/res/styles/main.less index 83117682..f87523fd 100644 --- a/res/styles/main.less +++ b/res/styles/main.less @@ -418,10 +418,8 @@ body { padding: 8px 30px 8px 12px; } .close { - position: absolute; line-height: 10px; - margin-left: -30px; - margin-top: 2px; + margin: 2px 0 2px -30px; padding: 0 8px 4px; font-weight: normal; height: 34px;