alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-06-05 19:07:45 +08:00
parent 480bbeeda0 ed24126648
commit a577307a5c
45 changed files with 242 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/lib/group/_group-category.scss
View File

@ -1,4 +1,5 @@
@charset "utf-8";
@import "group-variables";
// Group category page
.group-category {

2
app/assets/stylesheets/lib/group/_group-classes.scss
View File

@ -1,4 +1,6 @@
@charset "utf-8";
@import "group-variables";
// Genernal classes and modules
.screen-reader {

1
app/assets/stylesheets/lib/group/_group-index.scss
View File

@ -1,4 +1,5 @@
@charset "utf-8";
@import "group-variables";
// Group index and public
#main-wrap .wrap-inner {

2
app/assets/stylesheets/lib/group/_group-members.scss
View File

@ -1,3 +1,5 @@
@import "group-variables";
// Group page
#main-wrap {
padding-top: 0;

1
app/assets/stylesheets/lib/group/_group-post.scss
View File

@ -1,4 +1,5 @@
@charset "utf-8";
@import "group-variables";
// Group page
#main-wrap {

1
app/assets/stylesheets/lib/group/_group-reset.scss
View File

@ -1,4 +1,5 @@
@charset "utf-8";
@import "group-variables";
// General style
body {

1
app/assets/stylesheets/lib/group/_group-show-post.scss
View File

@ -1,4 +1,5 @@
@charset "utf-8";
@import "group-variables";
// Group show post
.group-show-post {

6
app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
View File

@ -346,10 +346,6 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
width: auto;
height: 85%;
}
// background-position: center;
// background-repeat: no-repeat;
// background-image: url('<%= asset_path 'orbit-logo.svg' %>');
// background-image: url('<%= asset_path 'orbit-logo.png' %>')\9;
& + ul {
left: 0;
}
@ -420,7 +416,7 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
}
}
@media (max-width: 479px) {
@media (max-width: 540px) {
#orbit-bar {
.login-window {
width: 90%;

22
app/templates/orbit_bootstrap/assets/javascripts/app.js
View File

@ -142,6 +142,27 @@
this.helpers.addClass(els[i], 'dropdown-menu');
}
}
},
// Go back top button
goBackTop: function(txt, speed) {
var top = document.createElement('div');
top.className = 'go-back-top';
top.textContent = txt;
doc.body.appendChild(top);
$(window).scroll(function() {
if($(this).scrollTop() != 0) {
$('.go-back-top').fadeIn();
} else {
$('.go-back-top').fadeOut();
}
});
$('.go-back-top').click(function() {
$('body, html').animate({scrollTop:0}, speed);
return false;
});
}
};
@ -156,6 +177,7 @@
// Functions that will be running on every page
orbit.sitemenuDropdown();
orbit.goBackTop('top', 800);
orbit.plugins.bullEye();
}

7
app/templates/orbit_bootstrap/assets/stylesheets/template/base/_accesskey.scss Normal file
View File

@ -0,0 +1,7 @@
@charset "utf-8";
a[accesskey] {
position: absolute;
margin-left: -15px;
color: transparent !important;
}

78
app/templates/orbit_bootstrap/assets/stylesheets/template/base/_global.scss
View File

@ -1,54 +1,82 @@
@charset "utf-8";
@import "../initial";
@import "variables";
html {
font-size: 100%;
font-size: 100%;
}
body {
font-family: $sub-font;
font-size: inherit;
margin-top: 40px;
font-family: $sub-font;
font-size: inherit;
margin-top: 40px;
}
a:link,
a:visited {
color: $brand-primary;
}
a:hover,
a:focus {
text-decoration: none;
color: lighten($brand-primary, 10%);
text-decoration: none;
}
img {
max-width: 100%;
height: auto;
max-width: 100%;
height: auto;
}
.admin-edit {
clear: both;
clear: both;
}
// override bootsrap settings
th,
td {
padding: 8px .5rem;
padding: 8px .5rem;
}
.borderless>tbody>tr>td,
.borderless>tbody>tr>th,
.borderless>tfoot>tr>td,
.borderless>tfoot>tr>th,
.borderless>thead>tr>td,
.borderless>thead>tr>th {
border: none !important;
.borderless > tbody > tr > td,
.borderless > tbody > tr > th,
.borderless > tfoot > tr > td,
.borderless > tfoot > tr > th,
.borderless > thead > tr > td,
.borderless > thead > tr > th {
border: none !important;
}
a.btn-primary {
color: $theme-white;
border-color: $theme-color-main;
background-color: $theme-color-main;
font-size: 0.8125rem;
&:hover {
background-color: darken($theme-color-main, 10%);
border-color: darken($theme-color-main, 10%);
}
}
// Page heading
.page-module-title {
@extend .unity-title;
margin-bottom: 18px;
@extend .unity-title;
margin-bottom: 18px;
}
.view-count {
font-size: 0.75rem;
}
.view_count {
> i {
font-size: 0.75rem;
&:before {
margin-right: 8px;
}
.view_count {
> i {
font-size: 0.75rem;
&:before {
margin-right: 8px;
}
}
}
}

21
app/templates/orbit_bootstrap/assets/stylesheets/template/base/_go_back_top.scss Normal file
View File

@ -0,0 +1,21 @@
@charset "utf-8";
@import "variables";
.go-back-top {
background: rgba($theme-color-main, .9);
text-align: center;
padding: 10px 12px;
position: fixed;
bottom: 15px;
right: 15px;
cursor: pointer;
display: none;
color: $theme-white;
font-size: 12px;
border-radius: 2px;
z-index: 1050;
&:hover {
background: rgba($theme-color-main, 1);
}
}

2
app/templates/orbit_bootstrap/assets/stylesheets/template/base/_orbitbar-override.scss
View File

@ -35,7 +35,7 @@ body {
}
}
@media (max-width: 479px) {
@media (max-width: 540px) {
body {
#orbit-bar ul.orbit-bar-search-sign-language > li + li:hover > a,
#orbit-bar ul.orbit-bar-search-sign-language > li + li:hover > span {

10
app/templates/orbit_bootstrap/assets/stylesheets/template/base/_pagination.scss
View File

@ -1,10 +1,20 @@
@charset "utf-8";
@import "variables";
.pagination {
li {
a {
font-size: 0.8125rem;
margin: 0 0.2em;
color: $theme-color-main;
}
}
.active {
a {
background-color: $theme-color-main;
border-color: $theme-color-main;
}
}
}

2
app/templates/orbit_bootstrap/assets/stylesheets/template/layout/header.scss
View File

@ -12,7 +12,7 @@
@extend .response-content;
}
.header-nav {
padding-top: 0.5rem;
padding: 16px 0;
color: #FFF;
& > * {
display: inline-block;

5
app/templates/orbit_bootstrap/assets/stylesheets/template/layout/slide.scss
View File

@ -5,4 +5,9 @@
position: relative;
margin-bottom: 2rem;
z-index: 0;
background: $theme-gray;
.w-ad-banner {
max-width: 1200px;
margin: auto;
}
}

7
app/templates/orbit_bootstrap/assets/stylesheets/template/modules/member.scss
View File

@ -114,13 +114,6 @@
height: 125px;
}
.i-member-pic {
position: absolute;
top: -100%;
left: 0;
right: 0;
bottom: -100%;
margin: auto;
width: 100%;
}
}
}

2
app/templates/orbit_bootstrap/assets/stylesheets/template/template.scss
View File

@ -4,6 +4,8 @@
@import "base/pagination";
@import "base/orbitbar-override";
@import "base/global";
@import "base/accesskey";
@import "base/go_back_top";
// Layout
@import "layout/header";

26
app/templates/orbit_bootstrap/assets/stylesheets/template/widget/breadcrumb.scss
View File

@ -1,16 +1,20 @@
@charset "utf-8";
@import "../initial";
.widget-breadcrumb {
&.widget1 {
li {
&:last-child {
a {
color: $theme-gray-dark;
pointer-events: none;
}
}
}
}
}
&.widget1 {
li {
a {
font-size: 0.8125rem;
}
&:last-child {
a {
color: $theme-gray-dark;
pointer-events: none;
}
}
}
}
}

1
app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget1.html.erb
View File

@ -5,6 +5,7 @@
data-cycle-slides=".w-ad-banner__slide"
data-cycle-log="false"
data-overlay=".w-ad-banner__caption"
data-cycle-auto-height="calc"
data-pager=".w-ad-banner__pager-1"
data-pager-template="<li><a href='#'></a></li>"
data-pager-active-class="active-slide"

1
app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2.html.erb
View File

@ -4,6 +4,7 @@
data-level="0"
data-cycle-slides=".w-ad-banner__slide"
data-cycle-log="false"
data-cycle-auto-height="calc"
data-overlay=".w-ad-banner__caption"
data-pager=".w-ad-banner__pager"
data-pager-template="<li><a href='#'></a></li>"

1
app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget2_video.html.erb
View File

@ -7,6 +7,7 @@
data-cycle-log="false"
data-overlay=".w-ad-banner__caption"
data-cycle-auto-height="640:360"
data-cycle-auto-height="calc"
data-pager=".w-ad-banner__pager-2"
data-pager-template="<li><a href='#'></a></li>"
data-pager-active-class="active-slide"

1
app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget3.html.erb
View File

@ -4,6 +4,7 @@
data-level="0"
data-cycle-slides=".w-ad-banner__slide"
data-cycle-log="false"
data-cycle-auto-height="calc"
data-pager=".w-ad-banner__pager-3"
data-pager-template="<li><a href='#'></a></li>"
data-pager-active-class="active-slide"

1
app/templates/orbit_bootstrap/modules/ad_banner/_ad_banner_widget4.html.erb
View File

@ -4,6 +4,7 @@
data-level="0"
data-cycle-slides=".w-ad-banner__slide"
data-cycle-log="false"
data-cycle-auto-height="calc"
>
<div class="w-ad-banner__slide {{class}}"
data-link="{{link}}"

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget1.html.erb
View File

@ -26,4 +26,7 @@
<p class="w-annc__subtitle">{{subtitle}}</p>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget10.html.erb
View File

@ -16,4 +16,7 @@
</span>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget11.html.erb
View File

@ -16,4 +16,7 @@
</h4>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget12.html.erb
View File

@ -21,4 +21,7 @@
</tr>
</tbody>
</table>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget13.html.erb
View File

@ -21,4 +21,7 @@
</tr>
</tbody>
</table>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

4
app/templates/orbit_bootstrap/modules/announcement/_annc_widget14.html.erb
View File

@ -23,5 +23,7 @@
</li>
</ul>
</div>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget2.html.erb
View File

@ -28,4 +28,7 @@
</div>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

5
app/templates/orbit_bootstrap/modules/announcement/_annc_widget3.html.erb
View File

@ -24,8 +24,11 @@
<p class="w-annc__subtitle">{{subtitle}}</p>
</div>
<div class="w-annc__img-wrap col-sm-4 bullseye">
<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}"">
<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
</div>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget4.html.erb
View File

@ -28,4 +28,7 @@
</div>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget5.html.erb
View File

@ -25,4 +25,7 @@
</div>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget6.html.erb
View File

@ -20,4 +20,7 @@
</span>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget7.html.erb
View File

@ -20,4 +20,7 @@
</span>
</li>
</ul>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget8.html.erb
View File

@ -23,4 +23,7 @@
</tr>
</tbody>
</table>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

3
app/templates/orbit_bootstrap/modules/announcement/_annc_widget9.html.erb
View File

@ -23,4 +23,7 @@
</tr>
</tbody>
</table>
<div class="w-annc__more-wrap clearfix">
<a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}">Read more</a>
</div>
</div>

11
app/templates/orbit_bootstrap/modules/personal_book/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
</table>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

9
app/templates/orbit_bootstrap/modules/personal_conference/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

11
app/templates/orbit_bootstrap/modules/personal_diploma/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
</table>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

11
app/templates/orbit_bootstrap/modules/personal_experience/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
</table>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

11
app/templates/orbit_bootstrap/modules/personal_honor/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
</table>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

9
app/templates/orbit_bootstrap/modules/personal_journal/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

11
app/templates/orbit_bootstrap/modules/personal_lab/show.html.erb
View File

@ -1,5 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr><th class="{{title_class}}">{{title}}</th><td class="{{value_class}}">{{value}}</td></tr>
</tbody>
</table>
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>