Skip to content

Commit

Permalink
Update themes
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemjohn committed May 18, 2017
1 parent aa883af commit 88e023f
Show file tree
Hide file tree
Showing 20 changed files with 221 additions and 40 deletions.
2 changes: 2 additions & 0 deletions admin/assets/css/vendor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/assets/css/vendor.css.map

Large diffs are not rendered by default.

Binary file removed admin/assets/img/._logo-white.svg
Binary file not shown.
Binary file removed admin/assets/img/._logo.svg
Binary file not shown.
4 changes: 4 additions & 0 deletions admin/assets/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ $(function () {
}
});

$('.select2').select2();

$('input[type="datetime"], .pickdatetime').datetimepicker({
format:'Y-m-d H:i',
}).prop('type','text');
Expand Down Expand Up @@ -120,6 +122,8 @@ $( document ).ajaxComplete(function() {
}
});

$('.select2').select2();

$('.html-editor-mini').summernote({
height: "200px",
toolbar: [
Expand Down
3 changes: 3 additions & 0 deletions admin/assets/js/vendor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/assets/js/vendor.js.map

Large diffs are not rendered by default.

201 changes: 200 additions & 1 deletion public/assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -2438,6 +2438,206 @@ body.modal-open {
margin-bottom: 3px;
}



.profile-wraper {
background-color: #f7f7f7;
min-height: 850px;
padding: 60px 0;
}
.profile-wraper .info-box {
background-color: #fff;
border-radius: 6px;
overflow: hidden;
}
.profile-wraper .info-box .cover-pic {
min-height: 140px;
position: relative;
-webkit-background-size: cover;
background-size: cover;
background-position: center;
}
.profile-wraper .info-box .cover-pic::before {
background-color: #000;
content: '';
position: absolute;
left: 0;
right: 0;
top: 0;
display: block;
width: 100%;
bottom: 0;
opacity: 0.3;
}
.profile-wraper .info-box .info {
position: relative;
z-index: 1;
padding: 0px 30px 30px 30px;
}
.profile-wraper .info-box .img-wrap {
border-radius: 50%;
height: 130px;
margin: -80px auto 0;
padding: 4px;
position: relative;
width: 130px;
background: #fff;
}
.profile-wraper .info-box .img-wrap img {
width: 122px;
height: 122px;
}
.profile-wraper .info-box .info h3 {
color: #666;
font-size: 18px;
}
.profile-wraper .info-box .info h4 {
font-size: 12px;
color: #999;
}
.profile-wraper .tabs {
background-color: #fff;
border-radius: 6px;
}
.profile-wraper .tabs .nav-tabs {
border-bottom: 1px solid #eee;
padding-top: 15px;
padding-bottom: 15px;
}
.profile-wraper .tabs .nav-tabs li {
position: relative;
text-align: center;
}
.profile-wraper .tabs .nav-tabs li::after {
background-color: #C93756;
content: '';
display: block;
width: 0;
height: 2px;
bottom: -15px;
position: relative;
margin: 0 auto;
-webkit-transition: 0.3s ease-in-out;
transition: 0.3s ease-in-out;
}
.profile-wraper .tabs .nav-tabs li a {
border: none;
border-radius: 0;
background-color: transparent;
padding: 0 15px;
color: #333;
opacity: 0.5;
-webkit-transition: 0.3s ease-in-out;
transition: 0.3s ease-in-out;
}
.profile-wraper .tabs .nav-tabs li a i {
font-weight: 700;
margin-right: 2px;
font-size: 12px;
}
.profile-wraper .tabs .nav-tabs li.active a {
opacity: 1;
}
.profile-wraper .tabs .nav-tabs li.active a i {
color: #C93756;
}
.profile-wraper .tabs .nav-tabs li.active::after {
width: calc(100% - 30px);
}
.profile-wraper .tabs .tab-content {
padding: 15px;
color: #666;
}
.profile-wraper .tabs .tab-content h3 {
margin-top: 0;
font-size: 18px;
}

.profile-wraper .info-box .social {
border-top: 1px solid rgba(33, 33, 33, 0.05);
padding: 30px 15px;
color: #212121;
}
.profile-wraper .info-box .social .counts {
font-size: 21px;
}
.profile-wraper .info-box .social .block {
display: block;
}
.profile-wraper .info-box .social .head-font {
font-weight: 700;
color: #666;
}
.profile-wraper .info-box .social .counts-text {
color: #999;
}
.profile-wraper .info-box .info .btn-social {
height: 32px;
width: 32px;
text-align: center;
border-radius: 50%;
padding: 6px;
}

.profile-wraper .info-box .info .btn i {
font-size: 16.5px;
line-height: 19px;
}
.profile-wraper .info-box.stats {
padding: 30px;
}
.profile-wraper .info-box.stats ul {
margin: 0;
padding: 0;
list-style: none;
}
.profile-wraper .info-box.stats ul li {
position: relative;
margin-bottom: 15px;
}
.profile-wraper .info-box.stats ul li:last-child {
margin-bottom: 0;
}
.profile-wraper .info-box.stats ul li a {
color: #0e3655;
}
.profile-wraper .info-box.stats ul li a span {
float: right;
opacity: 0.3;
}
.profile-wraper .info-box.stats ul li i {
display: inline-block;
width: 25px;
font-size: 16px;
vertical-align: middle;
}

.sidebar .widget.search form {
position: relative;
}
.sidebar .widget.search form .form-control {
background-color: #fff;
border: 1px solid #dedede;
}
.sidebar .widget.search form .btn {
width: 34px;
}
.sidebar .widget.tags ul li {
display: inline-block;
margin: 0 5px 10px 0px;
}
.sidebar .widget.tags ul li a {
background-color: #ededed;
padding: 5px 10px;
border-radius: 20px;
-webkit-transition: 0.3s ease-in-out;
transition: 0.3s ease-in-out;
}
.sidebar .widget.tags ul li a:hover {
background-color: #C93756;
color: #fff;
}

/* ==========================================================================
Helper classes
========================================================================== */
Expand Down Expand Up @@ -3214,4 +3414,3 @@ section.contact .sidebar .widget .content p + p {
margin-top: 0;
}


Binary file removed public/assets/img/logo/._logo.svg
Binary file not shown.
Binary file removed public/assets/img/logo/._white.svg
Binary file not shown.
Binary file removed public/assets/js/._install.js
Binary file not shown.
37 changes: 2 additions & 35 deletions public/assets/js/theme.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,4 @@
/*!
* Start Bootstrap - Freelancer Bootstrap Theme (http://startbootstrap.com)
* Code licensed under the Apache License v2.0.
* For details, see http://www.apache.org/licenses/LICENSE-2.0.
*/

// jQuery for page scrolling feature - requires jQuery Easing plugin
$(function() {
$('body').on('click', '.page-scroll a', function(event) {
var $anchor = $(this);
$('html, body').stop().animate({
scrollTop: $($anchor.attr('href')).offset().top
}, 1500, 'easeInOutExpo');
event.preventDefault();
});
});

// Floating label headings for the contact form
$(function() {
$("body").on("input propertychange", ".floating-label-form-group", function(e) {
$(this).toggleClass("floating-label-form-group-with-value", !! $(e.target).val());
}).on("focus", ".floating-label-form-group", function() {
$(this).addClass("floating-label-form-group-with-focus");
}).on("blur", ".floating-label-form-group", function() {
$(this).removeClass("floating-label-form-group-with-focus");
});
});

// Highlight the top nav as scrolling occurs
$('body').scrollspy({
target: '.navbar-fixed-top'
})

// Closes the Responsive Menu on Menu Item Click
$('.navbar-collapse ul li a').click(function() {
$('.navbar-toggle:visible').click();
$(function () {
$( "<div class='separator'><span></span><span></span><span></span></div>" ).insertAfter( $( "h3.border-bottom" ) );
});
1 change: 1 addition & 0 deletions public/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
$theme->asset()->usepath()->add('public', 'css/vendor.css');
$theme->asset()->usepath()->add('main', 'css/main.css');
$theme->asset()->usepath()->add('jquery', 'packages/jquery/js/jquery.min.js');
$theme->asset()->usepath()->add('public', 'js/theme.js');
},

// Listen on event before render a layout,
Expand Down
2 changes: 2 additions & 0 deletions user/assets/css/vendor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion user/assets/css/vendor.css.map

Large diffs are not rendered by default.

Binary file removed user/assets/img/._login.png
Binary file not shown.
Binary file removed user/assets/img/._logo-color.svg
Binary file not shown.
Binary file removed user/assets/js/._.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions user/assets/js/vendor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion user/assets/js/vendor.js.map

Large diffs are not rendered by default.

0 comments on commit 88e023f

Please sign in to comment.