Skip to content

S
solo-1
Commit 0b7d19da authored by Liang's avatar Liang
Browse files
Options

🎨 fixed #12493

parent 1bbf5117
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 858 additions and 1161 deletions
gulpfile.js
View file @ 0b7d19da
...@@ -31,7 +31,7 @@ var uglify = require('gulp-uglify'); ...@@ -31,7 +31,7 @@ var uglify = require('gulp-uglify');
var cleanCSS = require('gulp-clean-css'); var cleanCSS = require('gulp-clean-css');
var sass = require('gulp-sass'); var sass = require('gulp-sass');
gulp.task('default', function () { gulp.task('build', function () {
// min css // min css
gulp.src('./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.css') gulp.src('./src/main/webapp/js/lib/CodeMirrorEditor/codemirror.css')
.pipe(cleanCSS()) .pipe(cleanCSS())
...@@ -68,13 +68,14 @@ gulp.task('default', function () { ...@@ -68,13 +68,14 @@ gulp.task('default', function () {
}); });
gulp.task('sass', function () { gulp.task('sass', function () {
return gulp.src('./src/main/webapp/skins/*/css/*.scss') return gulp.src('./src/main/webapp/skins/*/css/*.scss')
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)) .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
.pipe(gulp.dest('./src/main/webapp/skins/*/css')); .pipe(gulp.dest('./src/main/webapp/skins'));
}); });
gulp.task('watch', function () { gulp.task('watch', function () {
gulp.watch('./src/main/webapp/skins/*/css/*.scss', ['sass']); gulp.watch('./src/main/webapp/skins/*/css/*.scss', ['sass']);
}); });
\ No newline at end of file
gulp.task('default', ['sass', 'build']);
\ No newline at end of file
package.json
View file @ 0b7d19da
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-clean-css": "^2.4.0", "gulp-clean-css": "^2.4.0",
"gulp-concat": "2.6.0", "gulp-concat": "2.6.0",
"gulp-sass": "^4.0.1",
"gulp-uglify": "^2.1.2", "gulp-uglify": "^2.1.2",
"marked": "^0.3.6" "marked": "^0.3.6"
} }
......
src/main/webapp/scss/_function.scss 0 → 100644
View file @ 0b7d19da
/*
* Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java.
* Copyright (C) 2012-2018, b3log.org & hacpai.com
*
* 本文件属于 Sym 商业版的一部分，请仔细阅读项目根文件夹的 LICENSE 并严格遵守相关约定
*/
/**
* Function and font text style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</ta>
* @version 0.2.0.0, Arp 29, 2018
*/
.fn {
&__flex {
display: flex;
&-center {
align-self: center;
}
&-inline {
display: inline-flex;
align-items: center;
}
&-1 {
flex: 1;
min-width: 1px;
}
&-column {
min-height: 100%;
display: flex;
flex-direction: column;
}
}
&__pointer {
cursor: pointer;
}
&__clear:before,
&__clear:after {
display: table;
content: "";
}
&__clear:after {
clear: both;
}
&__left {
float: left;
}
&__right {
float: right;
}
&__none {
display: none;
}
&__hidden {
visibility: hidden;
}
&__ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
word-wrap: normal;
}
}
.ft {
&__13 {
font-size: 13px;
}
&__smaller {
font-size: 12px;
}
&__center {
text-align: center;
}
&__nowrap {
white-space: nowrap;
}
}
\ No newline at end of file
src/main/webapp/scss/_reset-content.scss 0 → 100644
View file @ 0b7d19da
/*
* Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java.
* Copyright (C) 2012-2018, b3log.org & hacpai.com
*
* 本文件属于 Sym 商业版的一部分，请仔细阅读项目根文件夹的 LICENSE 并严格遵守相关约定
*/
/**
* Article reset style
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</ta>
* @version 0.2.0.2, Jul 6, 2018
*/
.content-reset {
word-wrap: break-word;
overflow: auto;
line-height: 1.65;
font-size: 16px;
word-break: break-word;
ul,
ol {
padding-left: 2em;
margin-top: 0;
margin-bottom: 16px;
}
li {
margin-top: 0.25em;
}
img {
cursor: zoom-in;
}
img.emoji {
cursor: auto;
max-width: 18px;
}
h1,
h2,
h3,
h4,
h5,
h6 {
margin-top: 24px;
margin-bottom: 16px;
font-weight: 600;
line-height: 1.25;
}
h1 {
padding-bottom: 0.3em;
font-size: 1.7em;
border-bottom: 1px solid #eee;
}
h2 {
padding-bottom: 0.3em;
font-size: 1.5em;
border-bottom: 1px solid #eee;
}
h3 {
font-size: 1.25em;
}
h4 {
font-size: 1em
}
h5 {
font-size: 0.875em;
}
h6 {
font-size: 0.85em;
}
hr {
height: 0.25em;
padding: 0;
margin: 24px 0;
background-color: #e7e7e7;
border: 0;
}
p {
margin-top: 0;
margin-bottom: 16px;
}
blockquote {
padding: 0 1em;
color: #777;
border-left: 0.25em solid #ddd;
margin-bottom: 16px;
}
blockquote p {
margin: 0;
}
iframe {
border: 1px solid rgba(0, 0, 0, .38);
}
table {
width: 100%;
border: 1px solid #dedede;
margin: 15px auto;
border-collapse: collapse;
empty-cells: show;
}
thead {
text-align: center;
}
td,
th {
height: 35px;
border: 1px solid #dedede;
padding: 0 10px;
}
th {
font-weight: bold;
text-align: center !important;
background: rgba(158, 188, 226, 0.2);
}
tbody tr:nth-child(2n) {
background: rgba(158, 188, 226, 0.12);
}
tr:hover {
background: #efefef;
}
code {
padding: 0.2em 0.4em;
margin: 0;
font-size: 85%;
background-color: rgba(252, 41, 41, 0.12);
border-radius: 3px;
word-break: break-word;
}
pre {
position: relative;
textarea {
position: absolute;
top: -100000px;
}
}
pre > code {
padding: 0.5em;
background-color: rgba(0, 0, 0, 0.04);
background-size: 20px 20px;
border-radius: 5px;
}
kbd {
display: inline-block;
padding: 3px 5px;
font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
line-height: 10px;
color: #555;
vertical-align: middle;
background-color: #fcfcfc;
border: solid 1px rgba(0, 0, 0, .38);
border-bottom-color: #bbb;
border-radius: 3px;
box-shadow: inset 0 -1px 0 #bbb;
}
li.task-list-item {
list-style: none;
& > input {
margin-left: -2em;
vertical-align: middle;
}
}
}
.img-preview {
width: 100%;
height: 100%;
top: 0;
z-index: 211;
overflow: auto;
cursor: zoom-out;
transition: background-color .2s ease-in-out;
img {
max-width: inherit;
transition: transform .3s ease-in-out;
}
}
\ No newline at end of file
src/main/webapp/scss/_reset.scss 0 → 100644
View file @ 0b7d19da
/*
* Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java.
* Copyright (C) 2012-2018, b3log.org & hacpai.com
*
* 本文件属于 Sym 商业版的一部分，请仔细阅读项目根文件夹的 LICENSE 并严格遵守相关约定
*/
/**
* Common style for reset
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</ta>
* @version 0.2.0.1, Arp 17, 2018
*/
html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
height: 100%;
}
body {
margin: 0;
font-family:"Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif ;
font-size: 14px;
background-color: #fff;
-webkit-font-smoothing: antialiased;
-webkit-overflow-scrolling: touch;
}
::-moz-selection {
text-shadow: none;
background: rgba(65, 131, 196, 0.4);
}
::selection {
text-shadow: none;
background: rgba(66, 133, 244, 0.4)
}
ul,
ol {
margin: 0;
padding: 0;
}
h1,
h2,
h3,
h4,
h5,
h6,
dl,
dd,
p {
margin: 0;
}
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
nav,
section {
display: block;
}
audio,
canvas,
video {
display: inline-block;
}
audio:not([controls]) {
display: none;
}
a {
outline: 0;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
sub,
sup {
position: relative;
font-size: 75%;
line-height: 0;
vertical-align: baseline;
}
sup {
top: -0.5em;
}
sub {
bottom: -0.25em;
}
img {
max-width: 100%;
vertical-align: middle;
border: 0;
height: auto;
-ms-interpolation-mode: bicubic;
overflow: hidden;
font-size: 12px;
}
button,
input,
select,
textarea {
margin: 0;
font-size: 100%;
vertical-align: middle;
font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", Tahoma, "Hiragino Sans GB", "Microsoft Yahei", sans-serif;
outline: none;
}
button,
input {
line-height: normal;
}
button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}
button,
input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
-webkit-appearance: button;
}
input[type="search"] {
box-sizing: content-box;
-webkit-appearance: textfield;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
textarea {
overflow: auto;
resize: vertical;
}
svg {
fill: currentColor;
display: inline-block;
stroke-width: 0;
stroke: currentColor;
width: 14px;
height: 14px;
}
blockquote {
margin: 0;
}
\ No newline at end of file
src/main/webapp/scss/_tooltipped.scss 0 → 100644
View file @ 0b7d19da
/*
* Symphony - A modern community (forum/BBS/SNS/blog) platform written in Java.
* Copyright (C) 2012-2018, b3log.org & hacpai.com
*
* 本文件属于 Sym 商业版的一部分，请仔细阅读项目根文件夹的 LICENSE 并严格遵守相关约定
*/
/**
* tool tip.
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.1.0.0, Apr 18, 2018
*/
@-webkit-keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
@keyframes tooltip-appear {
from {
opacity: 0
}
to {
opacity: 1
}
}
.tooltipped {
position: relative;
cursor: pointer;
&::after {
position: absolute;
z-index: 1000000;
display: none;
padding: 5px 8px;
font-size: 11px;
font-weight: normal;
-webkit-font-smoothing: subpixel-antialiased;
color: #fff;
text-align: center;
text-decoration: none;
text-shadow: none;
text-transform: none;
letter-spacing: normal;
word-wrap: break-word;
white-space: pre;
pointer-events: none;
content: attr(aria-label);
background: rgba(0, 0, 0, 0.8);
border-radius: 3px;
line-height: 16px;
opacity: 0
}
&::before {
position: absolute;
z-index: 1000001;
display: none;
width: 0;
height: 0;
color: rgba(0, 0, 0, 0.8);
pointer-events: none;
content: "";
border: 5px solid transparent;
opacity: 0
}
&--hover::before,
&--hover::after,
&:hover::before,
&:hover::after,
&:active::before,
&:active::after,
&:focus::before,
&:focus::after {
display: inline-block;
text-decoration: none;
animation-name: tooltip-appear;
animation-duration: 0.1s;
animation-fill-mode: forwards;
animation-timing-function: ease-in;
animation-delay: 0.4s
}
&__s::after,
&__se::after,
&__sw::after {
top: 100%;
right: 50%;
margin-top: 5px
}
&__s::before,
&__se::before,
&__sw::before {
top: auto;
right: 50%;
bottom: -5px;
margin-right: -5px;
border-bottom-color: rgba(0, 0, 0, 0.8)
}
&__se::after {
right: auto;
left: 50%;
margin-left: -15px
}
&__sw::after {
margin-right: -15px
}
&__n::after,
&__ne::after,
&__nw::after {
right: 50%;
bottom: 100%;
margin-bottom: 5px
}
&__n::before,
&__ne::before,
&__nw::before {
top: -5px;
right: 50%;
bottom: auto;
margin-right: -5px;
border-top-color: rgba(0, 0, 0, 0.8)
}
&__ne::after {
right: auto;
left: 50%;
margin-left: -15px
}
&__nw::after {
margin-right: -15px
}
&__s::after,
&__n::after {
transform: translateX(50%)
}
&__w::after {
right: 100%;
bottom: 50%;
margin-right: 5px;
transform: translateY(50%);
}
&__w::before {
top: 50%;
bottom: 50%;
left: -5px;
margin-top: -5px;
border-left-color: rgba(0, 0, 0, 0.8);
}
&__e::after {
bottom: 50%;
left: 100%;
margin-left: 5px;
transform: translateY(50%)
}
&__e::before {
top: 50%;
right: -5px;
bottom: 50%;
margin-top: -5px;
border-right-color: rgba(0, 0, 0, 0.8)
}
}
src/main/webapp/skins/nijigen/css/_icon.scss 0 → 100644
View file @ 0b7d19da
/**
* Solo - A small and beautiful blogging system written in Java.
* Copyright (c) 2010-2018, b3log.org & hacpai.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?oyqnlj');
src: url('fonts/icomoon.eot?oyqnlj#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?oyqnlj') format('truetype'),
url('fonts/icomoon.woff?oyqnlj') format('woff'),
url('fonts/icomoon.svg?oyqnlj#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="icon__"], [class*=" icon__"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon__list:before {
content: "\f0ca";
}
.icon__home:before {
content: "\f015";
}
.icon__comments:before {
content: "\f0e6";
}
.icon__date:before {
content: "\f073";
}
.icon__search:before {
content: "\f002";
}
.icon__up:before {
content: "\f077";
}
.icon__inbox:before {
content: "\f01c";
}
.icon__tags:before {
content: "\f02c";
}
.icon__link:before {
content: "\f0c1";
}
.icon__refresh:before {
content: "\f021";
}
.icon__category:before {
content: "\e9bc";
}
.icon__logout:before {
content: "\ea14";
}
.icon__views:before {
content: "\e900";
}
.icon__register:before {
content: "\e973";
}
.icon__setting:before {
content: "\e994";
}
.icon__login:before {
content: "\ea13";
}
.icon__rss:before {
content: "\e901";
}
src/main/webapp/skins/nijigen/css/base.css
View file @ 0b7d19da
This diff is collapsed.
src/main/webapp/skins/nijigen/css/base.scss
View file @ 0b7d19da
This diff is collapsed.
src/main/webapp/skins/nijigen/header.ftl
View file @ 0b7d19da
...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
<div class="bg"></div>
<div class="bg bg--1"></div>
<div class="bg bg--2"></div>
<div class="bg bg--3"></div>
<div class="bg bg--4"></div>
<div class="bg bg--5"></div>
<header class="header"> <header class="header">
<div class="header__wrap"> <div class="header__wrap">
<a href="${servePath}" rel="start" class="header__logo"> <a href="${servePath}" rel="start" class="header__logo">
......
src/main/webapp/skins/nijigen/side.ftl
View file @ 0b7d19da
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
--> -->
<aside> <aside class="side">
<section> <section>
<#if noticeBoard??> <#if noticeBoard??>
<div class="ad content-reset"> <div class="ad content-reset">
......
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