Skip to content

Commit

Permalink
Update forum for ilch standard classes
Browse files Browse the repository at this point in the history
  • Loading branch information
kveldscholten committed Mar 20, 2017
1 parent a58274f commit b5d61a5
Show file tree
Hide file tree
Showing 13 changed files with 63 additions and 183 deletions.
4 changes: 4 additions & 0 deletions application/layouts/clan3columns/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ h1 {
border-bottom: 1px solid #e5e5e5;
}

hr {
border-color: #E4E4E4;
}

.navbar-gaming {
background: #40434E;
border-bottom: 1px solid #32333B;
Expand Down
124 changes: 0 additions & 124 deletions application/modules/forum/static/css/forum.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ legend .forum.fa {
padding: 0;
}
#forum .forabg ul.forenlist li.header dl {
background-color: #43A6DF;
margin-bottom: 0;
}
#forum .forabg ul.forenlist li.header dl.title {
Expand All @@ -34,18 +33,9 @@ legend .forum.fa {
padding: 15px 12px;
}
}
#forum .forabg ul.forenlist li.header dl.title dt a {
color: #FFF;
}
#forum .forabg ul.forenlist li.header dl.title dt a:hover {
color: #FFF;
}
#forum .forabg ul.forenlist li.header dl.desc {
background-color: #f2f2f2;
border: 1px solid #e4e4e4;
width: 100%;
padding: 10px 5px;
color: #797979;
border-top: 0;
}
@media (min-width: 768px) {
Expand All @@ -54,14 +44,9 @@ legend .forum.fa {
}
}
#forum .forabg ul.forenlist.forums li {
color: #777;
margin: 0;
border: 1px solid #E4E4E4;
border-top: 0;
}
#forum .forabg ul.forenlist.forums li:hover {
background-color: #F2F2F2;
}
#forum .forabg ul.forenlist.forums li.row {
padding: 10px 0;
}
Expand Down Expand Up @@ -145,11 +130,9 @@ legend .forum.fa {
#forum .forabg ul.topiclist li {
display: block;
list-style-type: none;
color: #777;
margin: 0;
}
#forum .forabg ul.topiclist li.header dl {
background-color: #43A6DF;
margin-bottom: 0;
}
#forum .forabg ul.topiclist li.header dl.title {
Expand All @@ -172,12 +155,6 @@ legend .forum.fa {
width: 52%;
}
}
#forum .forabg ul.topiclist li.header dl.title dt a {
color: #FFF;
}
#forum .forabg ul.topiclist li.header dl.title dt a:hover {
color: #FFF;
}
#forum .forabg ul.topiclist li.header dl.title dd {
display: block;
float: left;
Expand Down Expand Up @@ -217,14 +194,9 @@ legend .forum.fa {
}
}
#forum .forabg ul.topiclist.topics li {
color: #777;
margin: 0;
border: 1px solid #E4E4E4;
border-top: 0;
}
#forum .forabg ul.topiclist.topics li:hover {
background-color: #F2F2F2;
}
#forum .forabg ul.topiclist.topics li.row {
padding: 10px 0;
}
Expand Down Expand Up @@ -346,22 +318,17 @@ legend .forum.fa {
}
}
#forum .foren-actions a {
color: #333;
text-decoration: underline;
}
#forum .foren-actions a:hover {
text-decoration: none;
}
#forum .statistic .header {
background-color: #2E3539;
color: #FFF;
padding: 15px 12px;
margin-top: 30px;
}
#forum .statistic .content {
background-color: #FFF;
padding: 12px;
border: 1px solid #E4E4E4;
border-top: 0;
margin-bottom: 12px;
}
Expand All @@ -371,11 +338,9 @@ legend .forum.fa {
}
}
#forum .statistic .content .statistics a {
color: #000;
text-decoration: underline;
}
#forum .statistic .content .statistics a:hover {
color: #000;
text-decoration: none;
}
#forum .statistic .content .statistics ul {
Expand Down Expand Up @@ -464,49 +429,30 @@ legend .forum.fa {
background-repeat: no-repeat;
background-position: 100% 0;
border: solid 1px #E4E4E4;
}
.post:target .content {
color: #000;
}

.bg1 {
background-color: #F7F7F7;
overflow: hidden;
}

.bg2 {
background-color: #F2F2F2;
}

.rowbg {
margin: 5px 5px 2px 5px;
}

.blue-header {
background-color: #43A6DF;
line-height: 48px;
padding: 0 12px;
color: #FFF;
font-weight: normal;
clear: both;
margin: 0;
}
.blue-header a {
color: #FFF !important;
}

.blue-header-content {
background-color: #FFF;
padding: 12px;
border: 1px solid #E4E4E4;
border-top: 0;
margin-bottom: 12px;
}

#forum .postbody {
padding: 0;
line-height: 1.48em;
color: #333;
width: 76%;
float: left;
clear: both;
Expand Down Expand Up @@ -551,12 +497,6 @@ legend .forum.fa {
line-height: 1.4em;
}

#forum .posthilit {
background-color: #f3f3f3;
color: #BCBCBC;
padding: 0 2px 1px 2px;
}

#forum p.author {
margin: 0 15em 0.6em 0;
padding: 0 0 5px 0;
Expand Down Expand Up @@ -593,8 +533,6 @@ legend .forum.fa {
#forum .postprofile {
margin: 5px 0 10px 0;
min-height: 80px;
color: #666;
border-left: 1px solid #FFF;
width: 22%;
float: right;
display: inline;
Expand All @@ -605,11 +543,6 @@ legend .forum.fa {
margin-left: 8px;
}

#forum .postprofile strong {
font-weight: normal;
color: #000;
}

#forum .avatar {
border: none;
margin-bottom: 3px;
Expand All @@ -622,70 +555,13 @@ legend .forum.fa {
overflow: hidden;
}

* html .post {
height: 25%;
overflow: hidden;
}

#forum dl.icon {
min-height: 35px;
height: auto !important;
height: 35px;
background-repeat: no-repeat;
}

#forum hr {
border-color: #E4E4E4;
}

#forum .post:target .content {
color: #000;
}

#forum .post:target h3 a {
color: #000;
}

#forum .bgblue, #forum .bgblue:hover {
background-color: #43A6DF;
color: #FFF !important;
}

#forum .bgblue:hover {
color: #FFF !important;
text-decoration: underline;
}

#forum .postlink:visited {
color: #43A6DF;
border-bottom-color: #43A6DF;
}

#forum .postprofile a:active {
color: #43A6DF;
}

#forum ul.forums,
#forum ul.topics {
background-color: #FFF;
}

#forum li.row:hover {
background-color: #F2F2F2;
}

#forum li.header dt, li.header dd {
color: #FFF;
}

#forum .postbody {
color: #333;
}

#forum .signature {
border-top-color: #E4E4E4;
}

#forum .topic-actions {
height: auto;
margin-bottom: 3px;
Expand Down
6 changes: 3 additions & 3 deletions application/modules/forum/views/Showunansweredtopics/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="forabg">
<ul class="topiclist">
<li class="header">
<dl class="title">
<dl class="title ilch-head">
<dt><?=$this->getTrans('topics') ?></dt>
<dd class="posts"><?=$this->getTrans('replies') ?> / <?=$this->getTrans('views') ?></dd>
<dd class="lastpost"><span><?=$this->getTrans('lastPost') ?></span></dd>
Expand All @@ -36,7 +36,7 @@
<?php if (is_in_array($groupIdsArray, explode(',', $forum->getReadAccess())) || $adminAccess == true): ?>
<?php $countPosts = $forumMapper->getCountPostsByTopicId($topic->getId()) ?>
<?php if ($countPosts -1 == 0): ?>
<li class="row bg1">
<li class="row ilch-border ilch-bg--hover">
<dl class="icon
<?php if ($this->getUser()): ?>
<?php if (in_array($this->getUser()->getId(), explode(',', $lastPost->getRead())) AND $topic->getStatus() == 0): ?>
Expand Down Expand Up @@ -76,7 +76,7 @@
<br>
<div class="small">
<?=$this->getTrans('by') ?>
<a href="<?=$this->getUrl(['controller' => 'showposts', 'action' => 'index','topicid' => $topic->getId()]) ?>" style="color: #AA0000;" class="username-coloured">
<a href="<?=$this->getUrl(['controller' => 'showposts', 'action' => 'index','topicid' => $topic->getId()]) ?>" class="ilch-link-red">
<?=$this->escape($topic->getAuthor()->getName()) ?>
</a>
»
Expand Down
4 changes: 2 additions & 2 deletions application/modules/forum/views/edittopic/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function rec($item, $obj, $readAccess, $i)
}
?>
<div id="forum" class="col-lg-12">
<h1><?=$this->getTrans('topicMoveTo') ?></h1>
<h1 class="blue-header ilch-head"><?=$this->getTrans('topicMoveTo') ?></h1>
<?php if (!empty($forumItems)): ?>
<form class="form-horizontal" method="POST" action="<?=$this->getUrl(['action' => 'edittopic']) ?>">
<?php echo $this->getTokenField(); ?>
Expand All @@ -65,7 +65,7 @@ function rec($item, $obj, $readAccess, $i)
</div>
</div>
<div class="col-lg-offset-2 col-lg-10">
<button type="submit" class="btn btn-labeled bgblue" name="edittopic" value="edittopic">
<button type="submit" class="btn btn-primary" name="edittopic" value="edittopic">
<?=$this->getTrans('move') ?>
</button>
</div>
Expand Down
Loading

0 comments on commit b5d61a5

Please sign in to comment.