From c41d8dbbe029d7854a31a65714709dc596309636 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 16 Aug 2015 14:16:47 -0700 Subject: [PATCH] Fixes #1129 - hardcoded term 'by' replaced with Glyph. Warning: Template changes - see style.css --- e107_plugins/news/templates/news_template.php | 32 +++++++++---------- .../bootstrap3/css/bootstrap-dark.min.css | 6 ++-- e107_themes/bootstrap3/style.css | 14 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php index 6f65cb7ec..5d7abf958 100644 --- a/e107_plugins/news/templates/news_template.php +++ b/e107_plugins/news/templates/news_template.php @@ -44,6 +44,7 @@ $NEWS_TEMPLATE['list']['item'] = '

+
'; @@ -112,29 +113,28 @@ $NEWS_TEMPLATE['default']['item'] = ' // As displayed by news.php?extend.1 $NEWS_TEMPLATE['view']['item'] = ' -{SETIMAGE: w=900&h=300} +{SETIMAGE: w=900&h=600}
-

{NEWSTITLELINK}

-

by {NEWSAUTHOR}

-
+

{NEWSTITLELINK}

+

{NEWSSUMMARY}

+
-
{GLYPH=time} {NEWSDATE=short}
-
{GLYPH=tags}  {NEWSTAGS}   {GLYPH=folder-open}  {NEWSCATEGORY}
+
{GLYPH=user}  {NEWSAUTHOR}   {GLYPH=time}  {NEWSDATE=short}
+
{GLYPH=tags}  {NEWSTAGS}   {GLYPH=folder-open}  {NEWSCATEGORY}

- {NEWSIMAGE: item=1} - {NEWSVIDEO: item=1} -
-

{NEWSSUMMARY}

-
+
- - {NEWSVIDEO: item=2} - {NEWSVIDEO: item=3} - - + {NEWSIMAGE: item=1} {NEWSBODY=body} +
+ {NEWSVIDEO: item=1} + {NEWSVIDEO: item=2} + {NEWSVIDEO: item=3} +
+ +
{SETIMAGE: w=400&h=400} diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index f16659ce9..4db810d1f 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -1117,8 +1117,8 @@ a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer} .alert-success{background-color:#51a351;border-color:#559249;color:#fff} .alert-success hr{border-top-color:#4b8140} .alert-success .alert-link{color:#e6e6e6} -.alert-info{background-color:#5bc0de;border-color:#3dced8;color:#fff} -.alert-info hr{border-top-color:#2ac7d2} +.alert-info{background-color:#337ab7;border-color:#4f93ce;color:#fff} +.alert-info hr{border-top-color:#3b87c8} .alert-info .alert-link{color:#e6e6e6} .alert-warning{background-color:#f89406;border-color:#df6105;color:#fff} .alert-warning hr{border-top-color:#c65605} @@ -1494,4 +1494,4 @@ legend{color:#fff} a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#0f0f0f} .jumbotron{border:1px solid rgba(0,0,0,.6)} .panel-danger .panel-heading,.panel-info .panel-heading,.panel-primary .panel-heading,.panel-success .panel-heading,.panel-warning .panel-heading{border-color:#000} -.btn:focus,.nav-pills>li>a,.nav-tabs>li>a,.navbar-default .navbar-nav>li>a,.navbar-inverse .navbar-nav>li>a,a,a:active,a:hover{outline:0} +.btn:focus,.nav-pills>li>a,.nav-tabs>li>a,.navbar-default .navbar-nav>li>a,.navbar-inverse .navbar-nav>li>a,a,a:active,a:hover{outline:0} \ No newline at end of file diff --git a/e107_themes/bootstrap3/style.css b/e107_themes/bootstrap3/style.css index 7d75da370..51f991aee 100644 --- a/e107_themes/bootstrap3/style.css +++ b/e107_themes/bootstrap3/style.css @@ -126,25 +126,25 @@ img.featurebox { border-radius: 5px } @media all and (max-width: 767px) { .featurebox .carousel-indicators { top:10px; } - .featurebox-item-image.pull-left, .featurebox-item-image.pull-right { margin-top: 30px; } + .featurebox-item-image.pull-left, .featurebox-item-image.pull-right { margin-top: 30px; } + .news-images-main { padding-left: 0; padding-bottom:15px; padding-right:0} } /* Small devices Tablets .col-sm */ -@media all and (min-width: 768px) and (max-width: 991px) { - - +@media all and (min-width: 768px) and (max-width: 991px) { + .news-images-main { padding-left: 0; padding-bottom:5px } } /* Medium devices Desktops (≥992px) .col-md */ @media all and (min-width: 992px) and (max-width: 1199px) { - + .news-images-main { padding-left: 0; padding-bottom:5px} } /* Large devices (large desktops, 1200px and up).col-lg */ @media all and (min-width: 1200px) { - - + + .news-images-main { padding-left: 0; padding-bottom:5px} }