Skip to content

GitLab

mahara
mahara
Commit 49bf48b2 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files
Options

Switch out heading font 

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Id038d72a5789169148185e578a8f70c631e2cc51
parent 629a64e6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 26 deletions
htdocs/theme/bootstrap/static/sass/components/_list-group.scss
View file @ 49bf48b2
......@@ -35,6 +35,8 @@
}
.list-group-item-heading {
font-family: $font-family-serif;
font-weight: 300;
a {
&:hover {
text-decoration: none;
......@@ -50,7 +52,7 @@
}
h4.list-group-item-heading {
font-size: $font-size-base;
font-size: $font-size-base + 2;
}
.list-group-item-warning {
......
htdocs/theme/bootstrap/static/sass/typography/_typography.scss
View file @ 49bf48b2
......@@ -39,6 +39,11 @@ h4 {
margin-bottom: 5px;
}
h2 {
font-weight:300;
}
h2, h3, h4, h5, legend {
&.panel-heading {
margin: 0;
......
htdocs/theme/bootstrap/static/sass/utilities/_bootstrap-variables.scss
View file @ 49bf48b2
......@@ -96,8 +96,8 @@ $line-height-base: 1.5 !default; // 20/14
$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
//** By default, this inherits from the `<body>`.
$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-font-family: $font-family-serif !default;
$headings-font-weight: 300 !default;
$headings-line-height: 1.3 !default;
$headings-color: rgb(51, 51, 51);
......
htdocs/theme/bootstrap/static/sass/utilities/_whitespace.scss
View file @ 49bf48b2
......@@ -91,6 +91,9 @@
.mt0 {
margin-top: 0 !important;
}
.mtxs {
margin-top: 3px !important;
}
.mts {
margin-top: 5px !important;
}
......
htdocs/theme/bootstrap/templates/group/topicrows.tpl
View file @ 49bf48b2
......@@ -2,23 +2,24 @@
<tr>
<td>
<h3 class="title"><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->topicname|str_shorten_text:65:true}</a></h3>
<div class="forumpath text-small pts">
<a href="{$topic->groupurl}" class="topicgroup">{$topic->groupname|str_shorten_text:30:true}</a> >
<a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}" class="topicforum">{$topic->forumname|str_shorten_text:30:true}</a>
<div class="forumpath metadata pts">
<a href="{$topic->groupurl}" class="topicgroup text-muted">{$topic->groupname|str_shorten_text:20:true}</a> /
<a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}" class="topicforum text-muted">{$topic->forumname|str_shorten_text:20:true}</a>
</div>
</td>
<td class="text-center">{$topic->postcount}</td>
<td>
<p class="postdetail text-muted">
<p class="postdetail">
{$topic->body|str_shorten_html:80:true|strip_tags|safe}
</p>
<span class="poster">
<span class="poster metadata">
<a href="{profile_url($topic->poster)}">
{$topic->poster|display_name}
</a>
- {$topic->ctime|strtotime|format_date:'strftimedatetime'}
</span>
</td>
<td class="text-center">{$topic->postcount}</td>
</tr>
{/foreach}
htdocs/theme/bootstrap/templates/group/topics.tpl
View file @ 49bf48b2
{include file="header.tpl"}
<p class="lead">{str tag=activetopicsdescription section=interaction.forum}</p>
<div class="table-responsive">
<table id="topiclist" class="table">
<table id="topiclist" class="table fullwidth table-striped table-padded">
<thead>
<tr>
<th>{str tag=Topic section=interaction.forum}</th>
<th class="text-center">{str tag=Posts section=interaction.forum}</th>
<th>{str tag=lastpost section=interaction.forum}</th>
<th class="text-center">{str tag=Posts section=interaction.forum}</th>
</tr>
</thead>
<tbody>
......
htdocs/theme/bootstrap/templates/user/userfind.tpl
View file @ 49bf48b2
......@@ -4,7 +4,7 @@
</a>
<div class="row" id="friendinfo_{$user->id}">
<div class="col-sm-8">
<div class="user-icon mts mrm pull-left">
<div class="user-icon mtxs mrm pull-left">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$user|display_default_name}">
</div>
<div class="pull-left">
......@@ -26,13 +26,13 @@
</div>
</div>
<div class="col-sm-4">
<ul class="list-unstyled inner-link">
<ul class="list-unstyled inner-link text-small">
{if $user->pending}
<li class="approvefriend">
<li class="approvefriend pbs">
<span class="fa fa-check fa-lg text-primary"></span>
{$user->accept|safe}
</li>
<li class="denyrequest">
<li class="denyrequest pbs">
<span class="fa fa-ban fa-lg text-danger prs"></span>
<a href="{$WWWROOT}user/denyrequest.php?id={$user->id}&amp;returnto={$page}&amp;offset={$offset}" class="btn-deny">
{str tag='denyrequest' section='group'}
......@@ -40,7 +40,7 @@
</li>
{/if}
{if $user->friend}
<li class="removefriend">
<li class="removefriend pbs">
<span class="fa fa-lg text-danger fa-remove prs"></span>
<a href="{$WWWROOT}user/removefriend.php?id={$user->id}&amp;returnto={$page}&amp;offset={$offset}" class="btn-del">
{str tag='removefromfriendslist' section='group'}
......@@ -54,24 +54,24 @@
</li>
{elseif !$user->pending} {* Not an existing, pending, or requested friend *}
{if $user->friendscontrol == 'auth'}
<li class="friend">
<li class="friend pbs">
<span class="fa fa-user-plus fa-lg text-success prs"></span>
<a href="{$WWWROOT}user/requestfriendship.php?id={$user->id}&amp;returnto={$page}&amp;offset={$offset}" class="btn-request">
{str tag='sendfriendrequest' section='group'}
</a>
</li>
{elseif $user->friendscontrol == 'auto'}
<li class="friend">
<li class="friend pbs">
{$user->makefriend|safe}
</li>
{else}
<li class="nofriend">
<li class="nofriend pbs">
{str tag='userdoesntwantfriends' section='group'}
</li>
{/if}
{/if}
{if $user->messages}
<li class="messages">
<li class="messages pbs">
<span class="fa fa-envelope fa-lg text-default prs"></span>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}&amp;offset={$offset}" class="btn-message">
{str tag='sendmessage' section='group'}
......@@ -79,7 +79,7 @@
</li>
{/if}
{if $admingroups}
<li class="editgroup">
<li class="editgroup pbs">
<span class="fa fa-lg text-default fa-cogs prs"></span>
<a href="" onclick="showGroupBox(event, {$user->id})" class="btn-edit">{str tag='editgroupmembership' section='group'}</a>
</li>
......@@ -87,4 +87,4 @@
</ul>
</div>
</div>
</div>
\ No newline at end of file
</div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment