From 49745e9a6a53674bfc79e7c7ce29f0967b474ef0 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 13 Dec 2016 16:12:41 +0800 Subject: [PATCH] sync --- css-bootstrap/nav-tabs.js | 78 ------------------------- css-bootstrap/roojs-bootstrap-debug.css | 1 + ux/FlipClock.js | 0 3 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 css-bootstrap/nav-tabs.js delete mode 100644 ux/FlipClock.js diff --git a/css-bootstrap/nav-tabs.js b/css-bootstrap/nav-tabs.js deleted file mode 100644 index d73f290ac3..0000000000 --- a/css-bootstrap/nav-tabs.js +++ /dev/null @@ -1,78 +0,0 @@ -/* NAV TABS */ -.nav-tabs-custom { - margin-bottom: 20px; - background: #fff; - box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); -} -.nav-tabs-custom > .nav-tabs { - margin: 0; - border-bottom-color: #f4f4f4; -} -.nav-tabs-custom > .nav-tabs > li { - border-top: 3px solid transparent; - margin-bottom: -2px; - margin-right: 5px; -} -.nav-tabs-custom > .nav-tabs > li > a { - -webkit-border-radius: 0 !important; - -moz-border-radius: 0 !important; - border-radius: 0 !important; -} -.nav-tabs-custom > .nav-tabs > li > a, -.nav-tabs-custom > .nav-tabs > li > a:hover { - background: transparent; - margin: 0; -} -.nav-tabs-custom > .nav-tabs > li:not(.active) > a:hover, -.nav-tabs-custom > .nav-tabs > li:not(.active) > a:focus, -.nav-tabs-custom > .nav-tabs > li:not(.active) > a:active { - border-color: transparent; -} -.nav-tabs-custom > .nav-tabs > li.active { - border-top-color: #3c8dbc; -} -.nav-tabs-custom > .nav-tabs > li.active > a, -.nav-tabs-custom > .nav-tabs > li.active:hover > a { - background-color: #fff; -} -.nav-tabs-custom > .nav-tabs > li.active > a { - border-top: 0; - border-left-color: #f4f4f4; - border-right-color: #f4f4f4; -} -.nav-tabs-custom > .nav-tabs > li:first-of-type { - margin-left: 0px; -} -.nav-tabs-custom > .nav-tabs > li:first-of-type.active > a { - border-left-width: 0; -} -.nav-tabs-custom > .nav-tabs.pull-right { - float: none!important; -} -.nav-tabs-custom > .nav-tabs.pull-right > li { - float: right; -} -.nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type { - margin-right: 0px; -} -.nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type.active > a { - border-left-width: 1px; - border-right-width: 0px; -} -.nav-tabs-custom > .nav-tabs > li.header { - font-weight: 400; - line-height: 35px; - padding: 0 10px; - font-size: 20px; - color: #444; - cursor: default; -} -.nav-tabs-custom > .nav-tabs > li.header > .fa, -.nav-tabs-custom > .nav-tabs > li.header > .glyphicon, -.nav-tabs-custom > .nav-tabs > li.header > .ion { - margin-right: 10px; -} -.nav-tabs-custom > .tab-content { - background: #fff; - padding: 10px; -} \ No newline at end of file diff --git a/css-bootstrap/roojs-bootstrap-debug.css b/css-bootstrap/roojs-bootstrap-debug.css index 5c4820527b..a4f003c017 100644 --- a/css-bootstrap/roojs-bootstrap-debug.css +++ b/css-bootstrap/roojs-bootstrap-debug.css @@ -21,3 +21,4 @@ @import url('./table.css'); @import url('./tweaks.css'); @import url('./upload-cropbox.css'); +@import url('./no-padding.css'); diff --git a/ux/FlipClock.js b/ux/FlipClock.js deleted file mode 100644 index e69de29bb2..0000000000 -- 2.39.2