diff --git a/css/bootstrapdefault-theme.css b/css/bootstrapdefault-theme.css new file mode 100644 index 00000000..4921d511 --- /dev/null +++ b/css/bootstrapdefault-theme.css @@ -0,0 +1,376 @@ +.thumbnail > img, +.thumbnail a > img, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { + display: block; + max-width: 100%; + height: auto; +} +.html-radios-inline input[type=radio] { + position: absolute; + margin-left: -20px; + margin-top: 4px \9; +} +.html-radios-inline label + label { + margin-top: 0; + margin-left: 10px; +} +.btn-group-lg > .btn { + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +.btn-group-sm > .btn { + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +.btn-group-xs > .btn { + padding: 1px 5px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +div#the_page { + position: relative; + overflow-x: hidden; +} +#quickconnect .form-control { + margin-bottom: 10px; +} +.navbar-form-desktop { + display: none; +} +.navbar-main { + margin-bottom: 0px; +} +.navbar .navbar-right { + margin-right: 0; +} +.jumbotron { + margin-bottom: 0px; +} +@media screen and (min-width: 768px) { + .jumbotron h1, + .jumbotron .h1 { + font-size: 49px; + } +} + +.html-radios-inline label { + position: relative; + display: inline-block; + padding-left: 20px; + margin-bottom: 0; + vertical-align: middle; + font-weight: normal; + cursor: pointer; +} +.html-radios-inline label.disabled, +fieldset[disabled] .html-radios-inline label { + cursor: not-allowed; +} +.form-horizontal .html-radios-inline { + padding-top: 6px; +} +#content .col-outer { + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#content .col-inner .col-thumbnail .placeholder { + width: 260px; + height: 180px; +} +.content-grid .col-outer { + margin-top: 10px; + margin-bottom: 10px; +} +.content-grid .col-inner .col-thumbnail { + float: none; + margin-right: 0px; +} +.content-grid .col-inner .caption h3.title { + position: relative; +} +.content-grid .col-inner .caption h3.title a.recent { + padding-right: 16px; +} +.content-grid .col-inner .caption h3.title img { + position: absolute; + top: 6px; + right: 0; +} +.content-grid .col-inner .caption .description { + display: none; +} +.content-list .col-outer { + margin-top: 20px; + margin-bottom: 20px; +} +.content-list .col-inner .col-thumbnail { + float: left; + margin-right: 20px; +} +.content-list .col-inner .caption .description { + display: block; +} +.copyright { + padding: 30px; +} +.ellipsis { + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +#navigationButtons { + text-align: center; + margin-bottom: 15px; + font-size: 1.6em; +} +#navigationButtons a { + text-decoration: none; +} +#navigationButtons span.glyphicon { + margin-left: 25px; + margin-right: 25px; +} +#slideshow #navigationButtons { + margin-top: 20px; +} +#theImage { + position: relative; + overflow-x: hidden; + text-align: center; +} +#theImage img { + max-width: 100%; + height: auto; +} +#sidebar { + position: absolute; + right: -250px; + text-align: left; + z-index: 10000; +} +#sidebar .handle { + margin-top: 30px; + float: right; + background-color: #ccc; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-left: 1px solid #ccc; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + box-shadow: -5px 0 10px 0px #dddddd; +} +#sidebar .handle a { + display: block; + padding: 10px; + color: #fff; +} +#sidebar .handle a:hover { + color: #eee; +} +#sidebar .handle .glyphicon { + font-size: 1.2em; +} +#sidebar .info { + float: right; + background-color: #eeeeee; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-left: 1px solid #ccc; + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; + width: 250px; + padding: 20px; + box-shadow: -5px 0 10px 0px #dddddd; +} +#sidebar .info dl { + margin-bottom: 0; +} +#sidebar .info button { + max-width: 210px; +} +#important-info { + margin-top: 20px; +} +#important-info #visits { + float: left; +} +#important-info #visits span.count { + margin-left: 15px; +} +#important-info #rating { + float: right; +} +#important-info #rating .rateButtonStarFull { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + cursor: pointer; +} +#important-info #rating .rateButtonStarFull:before { + content: "\e006"; +} +#important-info #rating .rateButtonStarEmpty { + position: relative; + top: 1px; + display: inline-block; + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + cursor: pointer; +} +#important-info #rating .rateButtonStarEmpty:before { + content: "\e007"; +} +#share { + font-size: 2.5em; + text-align: center; +} +#share a { + padding-left: 20px; + padding-right: 20px; + text-decoration: none; +} +#disqus_thread { + margin-top: 20px; +} +#commentList .comment { + clear: both; +} +#commentList .comment .image img { + float: left; + width: 80px; + height: 80px; +} +#commentList .comment .description { + margin-left: 100px; +} +#commentList .comment .description form { + margin-top: 15px; + margin-bottom: 15px; +} +#commentList .comment .description .actions { + float: right; + font-size: 90%; +} +.comment-search { + margin-top: 20px; +} +.nav-pills { + margin-top: 25px; + margin-bottom: 25px; +} +#tagCloud { + font-size: 120%; + text-align: center; +} +#tagCloud span { + margin: 5px; +} +#tagCloud .tagLevel5 { + font-size: 150% !important; +} +#tagCloud .tagLevel4 { + font-size: 140% !important; +} +#tagCloud .tagLevel3 { + font-size: 120% !important; +} +#tagCloud .tagLevel2 { + font-size: 100% !important; +} +#tagCloud .tagLevel1 { + font-size: 90% !important; +} +#tagCloudCanvas { + width: 100%; + height: 600px; + margin: 0 auto; +} +#tagCloudCanvas span { + display: none; +} +#tagCloudGradientStart { + display: none; + color: #ccc; +} +#tagCloudGradientEnd { + display: none; + color: #337ab7; +} +#tagLetters { + padding-left: 2px; + padding-right: 7px; +} +#tagLetters *, +#tagLetters *:before, +#tagLetters *:after { + box-sizing: border-box !important; +} +#tagLetters .row { + -moz-column-width: 17em; + -webkit-column-width: 17em; + -moz-column-gap: -1em; + -webkit-column-gap: -1em; +} +#tagLetters .menu-category { + display: inline-block; + margin: 0.26rem; + padding: 1rem; + width: 100%; +} +#thePopuphelpPage .jumbotron { + display: none; +} +@media (min-width: 768px) { + .navbar-collapse { + padding-right: 0; + } + .dropdown-menu-scrollable { + height: auto; + max-height: 300px; + overflow-x: hidden; + } + .dropdown-menu-scrollable::-webkit-scrollbar { + width: 1em; + } + .dropdown-menu-scrollable::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + } + .dropdown-menu-scrollable::-webkit-scrollbar-thumb { + background-color: #777777; + outline: 1px solid #777777; + } +} +@media (min-width: 992px) { + .navbar-form-desktop { + display: block; + } +} + +#collectionsDropdown { + padding: 10px; + background-color: #fff; +} + +.user-collections-icon { + width:16px; + height:16px; +} diff --git a/css/fixplugins.css b/css/fixplugins.css index 6f71846a..36bde262 100644 --- a/css/fixplugins.css +++ b/css/fixplugins.css @@ -15,73 +15,6 @@ margin-top: 0; margin-left: 10px; } -/* -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.3333333; - border-radius: 6px; -} -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-xs > .btn { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.dl-horizontal dd:before, -.dl-horizontal dd:after, -.container:before, -.container:after, -.container-fluid:before, -.container-fluid:after, -.row:before, -.row:after, -.form-horizontal .form-group:before, -.form-horizontal .form-group:after, -.btn-toolbar:before, -.btn-toolbar:after, -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after, -.nav:before, -.nav:after, -.navbar:before, -.navbar:after, -.navbar-header:before, -.navbar-header:after, -.navbar-collapse:before, -.navbar-collapse:after, -.pager:before, -.pager:after, -.panel-body:before, -.panel-body:after, -.modal-footer:before, -.modal-footer:after { - content: " "; - display: table; -} -.dl-horizontal dd:after, -.container:after, -.container-fluid:after, -.row:after, -.form-horizontal .form-group:after, -.btn-toolbar:after, -.btn-group-vertical > .btn-group:after, -.nav:after, -.navbar:after, -.navbar-header:after, -.navbar-collapse:after, -.pager:after, -.panel-body:after, -.modal-footer:after { - clear: both; -} -*/ .pwg-icon { position: relative; top: 1px; diff --git a/template/comments.tpl b/template/comments.tpl index 3799ff72..eb71e27a 100644 --- a/template/comments.tpl +++ b/template/comments.tpl @@ -30,8 +30,8 @@
-
- {html_options options=$categories selected=$categories_selected} @@ -39,8 +39,10 @@
-
-{html_options name=since options=$since_options selected=$since_options_selected} +
+
@@ -52,20 +54,26 @@
-
-{html_options name=sort_by options=$sort_by_options selected=$sort_by_options_selected} +
+
-
-{html_options name=sort_order options=$sort_order_options selected=$sort_order_options_selected} +
+
-
- {html_options name=items_number options=$item_number_options selected=$item_number_options_selected} +
+
diff --git a/template/header.tpl b/template/header.tpl index df74c111..38ba0b6d 100644 --- a/template/header.tpl +++ b/template/header.tpl @@ -65,6 +65,7 @@ {/if} {* {combine_css path='themes/bootstrap_darkroom/components/jasny-bootstrap/dist/css/jasny-bootstrap.min.css' order=-15} *} {combine_css path='themes/bootstrap_darkroom/components/font-awesome/css/font-awesome.min.css' order=-14} + {combine_css path='themes/bootstrap_darkroom/css/bootstrapdefault-theme.css' order=-9} {foreach from=$themes item=theme} {if $theme.load_css} {combine_css path="themes/`$theme.id`/theme.css" order=-10} diff --git a/template/profile_content.tpl b/template/profile_content.tpl index 63e2342c..7d29bcfc 100644 --- a/template/profile_content.tpl +++ b/template/profile_content.tpl @@ -9,33 +9,33 @@ {if isset($loaded_plugins['user_custom_fields'])} {$UCF_PROFILE_ADD} {else} -
- -
-

{$USERNAME}

+
+ +
+
{if not $SPECIAL_USER} {* can modify password + email*} -
- +
+
-
- +
+
-
- +
+
-
- +
+
@@ -43,7 +43,7 @@ {/if} {if !$ALLOW_USER_CUSTOMIZATION} -
+
@@ -59,47 +59,51 @@ {'Preferences'|@translate}
-
- +
+
-
- -
-{html_options name=theme options=$template_options selected=$template_selection} +
+ +
+
-
- -
-{html_options name=language options=$language_options selected=$language_selection} +
+ +
+
-
- +
+
-
- -
+
+ +
{html_radios name='expand' options=$radio_options selected=$EXPAND}
{if $ACTIVATE_COMMENTS} -
- -
+
+ +
{html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
{/if} -
- -
+
+ +
{html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
diff --git a/themeconf.inc.php b/themeconf.inc.php index 255cfb86..3437276b 100644 --- a/themeconf.inc.php +++ b/themeconf.inc.php @@ -13,7 +13,7 @@ $themeconf = array( 'name' => 'bootstrap_darkroom', 'parent' => 'bootstrapdefault', - 'load_parent_css' => true, + 'load_parent_css' => false, 'load_parent_local_head' => true, 'local_head' => 'local_head.tpl', 'url' => 'https://kuther.net/'