diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserPageController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserPageController.java
index 0879ef4..799f38a 100644
--- a/src/main/java/com/yaoyuan/jiscuss/controller/UserPageController.java
+++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserPageController.java
@@ -33,7 +33,7 @@ import java.util.*;
* @date
*/
@Controller
-public class UserPageController {
+public class UserPageController extends BaseController {
private static Logger logger = LoggerFactory.getLogger(UserPageController.class);
@@ -53,7 +53,7 @@ public class UserPageController {
* @return
*/
@RequestMapping("/user")
- public String user(@RequestParam(defaultValue = "discussion") String type, ModelMap map) {
+ public String user(@RequestParam(defaultValue = "discussion") String type, HttpServletRequest request, ModelMap map) {
if (type.equals("discussion")) {
map.put("discussion", "active");
@@ -64,6 +64,12 @@ public class UserPageController {
if (type.equals("like")) {
map.put("like", "active");
}
+
+ UserInfo user = getUserInfo(request);
+ if (user != null) {
+ map.put("username", user.getUsername());
+ map.put("data", "Jiscuss 用户:" + user.getUsername());
+ }
return "user";
}
}
diff --git a/src/main/resources/application-mysql.yml b/src/main/resources/application-mysql.yml
index f4c5a84..99e1220 100644
--- a/src/main/resources/application-mysql.yml
+++ b/src/main/resources/application-mysql.yml
@@ -13,7 +13,7 @@ spring:
url: jdbc:mysql://127.0.0.1:3306/jiscuss?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
username: root
password: 123456
- driver-class-name: com.mysql.cj.jdbc.Driver
+ driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
tomcat:
init-s-q-l: SET NAMES utf8mb4
diff --git a/src/main/resources/pic/create.png b/src/main/resources/pic/create.png
new file mode 100644
index 0000000..68372f3
Binary files /dev/null and b/src/main/resources/pic/create.png differ
diff --git a/src/main/resources/pic/disscuss.png b/src/main/resources/pic/disscuss.png
new file mode 100644
index 0000000..3ff087e
Binary files /dev/null and b/src/main/resources/pic/disscuss.png differ
diff --git a/src/main/resources/pic/home.png b/src/main/resources/pic/home.png
new file mode 100644
index 0000000..0acabb6
Binary files /dev/null and b/src/main/resources/pic/home.png differ
diff --git a/src/main/resources/pic/login.png b/src/main/resources/pic/login.png
new file mode 100644
index 0000000..ca58e89
Binary files /dev/null and b/src/main/resources/pic/login.png differ
diff --git a/src/main/resources/static/semanticui/semantic.css b/src/main/resources/static/semanticui/semantic.css
index 68fbfd5..a6e1f9d 100644
--- a/src/main/resources/static/semanticui/semantic.css
+++ b/src/main/resources/static/semanticui/semantic.css
@@ -1,5 +1,5 @@
/*
- * # Semantic UI - 2.4.0
+ * # Semantic UI - 2.4.2
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
@@ -8,65 +8,9 @@
* http://opensource.org/licenses/MIT
*
*/
-
-/* lato-regular */
-@font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: regular;
- src: url('//lib.baomitu.com/fonts/lato/lato-regular.eot'); /* IE9 Compat Modes */
- src: local('Lato'), local('Lato-Normal'),
- url('//lib.baomitu.com/fonts/lato/lato-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('//lib.baomitu.com/fonts/lato/lato-regular.woff2') format('woff2'), /* Super Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-regular.woff') format('woff'), /* Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-regular.ttf') format('truetype'), /* Safari, Android, iOS */
- url('//lib.baomitu.com/fonts/lato/lato-regular.svg#Lato') format('svg'); /* Legacy iOS */
-}
-
-/* lato-700 */
-@font-face {
- font-family: 'Lato';
- font-style: normal;
- font-weight: 700;
- src: url('//lib.baomitu.com/fonts/lato/lato-700.eot'); /* IE9 Compat Modes */
- src: local('Lato'), local('Lato-Normal'),
- url('//lib.baomitu.com/fonts/lato/lato-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('//lib.baomitu.com/fonts/lato/lato-700.woff2') format('woff2'), /* Super Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-700.woff') format('woff'), /* Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-700.ttf') format('truetype'), /* Safari, Android, iOS */
- url('//lib.baomitu.com/fonts/lato/lato-700.svg#Lato') format('svg'); /* Legacy iOS */
-}
-
-/* lato-italic */
-@font-face {
- font-family: 'Lato';
- font-style: italic;
- font-weight: regular;
- src: url('//lib.baomitu.com/fonts/lato/lato-italic.eot'); /* IE9 Compat Modes */
- src: local('Lato'), local('Lato-Italic'),
- url('//lib.baomitu.com/fonts/lato/lato-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('//lib.baomitu.com/fonts/lato/lato-italic.woff2') format('woff2'), /* Super Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-italic.woff') format('woff'), /* Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-italic.ttf') format('truetype'), /* Safari, Android, iOS */
- url('//lib.baomitu.com/fonts/lato/lato-italic.svg#Lato') format('svg'); /* Legacy iOS */
-}
-
-/* lato-700italic */
-@font-face {
- font-family: 'Lato';
- font-style: italic;
- font-weight: 700;
- src: url('//lib.baomitu.com/fonts/lato/lato-700italic.eot'); /* IE9 Compat Modes */
- src: local('Lato'), local('Lato-Italic'),
- url('//lib.baomitu.com/fonts/lato/lato-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('//lib.baomitu.com/fonts/lato/lato-700italic.woff2') format('woff2'), /* Super Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-700italic.woff') format('woff'), /* Modern Browsers */
- url('//lib.baomitu.com/fonts/lato/lato-700italic.ttf') format('truetype'), /* Safari, Android, iOS */
- url('//lib.baomitu.com/fonts/lato/lato-700italic.svg#Lato') format('svg'); /* Legacy iOS */
-}
-
+@import url('https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic&subset=latin');
/*!
- * # Semantic UI 2.4.0 - Reset
+ * # Semantic UI 2.4.2 - Reset
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -597,7 +541,7 @@ template {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Site
+ * # Semantic UI 2.4.2 - Site
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -816,7 +760,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Button
+ * # Semantic UI 2.4.2 - Button
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -2159,7 +2103,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
}
.ui.eight.buttons > .button {
- width: 12.500%;
+ width: 12.5%;
}
.ui.nine.buttons {
@@ -2229,7 +2173,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
}
.ui.eight.vertical.buttons > .button {
- height: 12.500%;
+ height: 12.5%;
}
.ui.nine.vertical.buttons > .button {
@@ -5177,7 +5121,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Container
+ * # Semantic UI 2.4.2 - Container
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -5338,7 +5282,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Divider
+ * # Semantic UI 2.4.2 - Divider
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -5605,7 +5549,7 @@ body .ui.inverted::-webkit-scrollbar-thumb:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Flag
+ * # Semantic UI 2.4.2 - Flag
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -6882,7 +6826,7 @@ i.flag.zimbabwe:before {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Header
+ * # Semantic UI 2.4.2 - Header
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -7709,7 +7653,7 @@ a.ui.inverted.grey.header:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Icon
+ * # Semantic UI 2.4.2 - Icon
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -13861,7 +13805,7 @@ i.icon.youtube.square {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Image
+ * # Semantic UI 2.4.2 - Image
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -14183,7 +14127,7 @@ img.ui.bordered.image {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Input
+ * # Semantic UI 2.4.2 - Input
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -14755,7 +14699,7 @@ img.ui.bordered.image {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Label
+ * # Semantic UI 2.4.2 - Label
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -15101,16 +15045,16 @@ a.ui.label {
/* Positioning */
.ui.ribbon.label {
- left: calc( -1rem - 1.2em );
+ left: calc(-1rem - 1.2em);
margin-right: -1.2em;
- padding-left: calc( 1rem + 1.2em );
+ padding-left: calc(1rem + 1.2em);
padding-right: 1.2em;
}
.ui[class*="right ribbon"].label {
- left: calc(100% + 1rem + 1.2em );
+ left: calc(100% + 1rem + 1.2em);
padding-left: 1.2em;
- padding-right: calc( 1rem + 1.2em );
+ padding-right: calc(1rem + 1.2em);
}
/* Right Ribbon */
@@ -15141,23 +15085,23 @@ a.ui.label {
.ui.card .image > .ui.ribbon.label,
.ui.image > .ui.ribbon.label {
- left: calc( 0.05rem - 1.2em );
+ left: calc(--0.05rem - 1.2em);
}
.ui.card .image > .ui[class*="right ribbon"].label,
.ui.image > .ui[class*="right ribbon"].label {
- left: calc(100% + -0.05rem + 1.2em );
+ left: calc(100% + -0.05rem + 1.2em);
padding-left: 0.833em;
}
/* Inside Table */
.ui.table td > .ui.ribbon.label {
- left: calc( -0.78571429em - 1.2em );
+ left: calc(-0.78571429em - 1.2em);
}
.ui.table td > .ui[class*="right ribbon"].label {
- left: calc(100% + 0.78571429em + 1.2em );
+ left: calc(100% + 0.78571429em + 1.2em);
padding-left: 0.833em;
}
@@ -16186,7 +16130,7 @@ a.ui.basic.label:hover {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - List
+ * # Semantic UI 2.4.2 - List
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -17265,7 +17209,7 @@ ol.ui.horizontal.list li:before,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Loader
+ * # Semantic UI 2.4.2 - Loader
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -17643,7 +17587,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Loader
+ * # Semantic UI 2.4.2 - Loader
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -17922,7 +17866,7 @@ ol.ui.horizontal.list li:before,
max-width: none;
}
/*!
- * # Semantic UI 2.4.0 - Rail
+ * # Semantic UI 2.4.2 - Rail
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -18084,7 +18028,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Reveal
+ * # Semantic UI 2.4.2 - Reveal
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -18399,7 +18343,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Segment
+ * # Semantic UI 2.4.2 - Segment
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -19274,8 +19218,8 @@ ol.ui.horizontal.list li:before,
bottom: 0px;
border-radius: 0px;
margin: 0em -1px;
- width: calc(100% + 2px );
- max-width: calc(100% + 2px );
+ width: calc(100% - (-1px * 2));
+ max-width: calc(100% - (-1px * 2));
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #D4D4D5;
@@ -19367,7 +19311,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Step
+ * # Semantic UI 2.4.2 - Step
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -19905,9 +19849,9 @@ ol.ui.horizontal.list li:before,
/* Top */
.ui.attached.steps {
- width: calc(100% + 2px ) !important;
+ width: calc(100% + (--1px * 2)) !important;
margin: 0em -1px 0;
- max-width: calc(100% + 2px );
+ max-width: calc(100% + (--1px * 2));
border-radius: 0.28571429rem 0.28571429rem 0em 0em;
}
@@ -19990,7 +19934,7 @@ ol.ui.horizontal.list li:before,
}
.ui.eight.steps > .step {
- width: 12.500%;
+ width: 12.5%;
}
/*-------------------
@@ -20057,7 +20001,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Breadcrumb
+ * # Semantic UI 2.4.2 - Breadcrumb
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -20188,7 +20132,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Form
+ * # Semantic UI 2.4.2 - Form
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -21367,7 +21311,7 @@ ol.ui.horizontal.list li:before,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Grid
+ * # Semantic UI 2.4.2 - Grid
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -21527,7 +21471,7 @@ ol.ui.horizontal.list li:before,
}
.ui.grid .column + .ui.vertical.divider {
- height: calc(50% - 1rem );
+ height: calc(50% - (2rem / 2));
}
/* Remove Border on Last Horizontal Segment */
@@ -22614,7 +22558,7 @@ ol.ui.horizontal.list li:before,
content: "";
top: 0em;
left: 0px;
- width: calc(100% - 2rem );
+ width: calc(100% - 2rem);
height: 1px;
margin: 0% 1rem;
-webkit-box-shadow: 0px -1px 0px 0px rgba(34, 36, 38, 0.15);
@@ -22659,13 +22603,13 @@ ol.ui.horizontal.list li:before,
.ui.relaxed[class*="vertically divided"].grid > .row:before {
margin-left: 1.5rem;
margin-right: 1.5rem;
- width: calc(100% - 3rem );
+ width: calc(100% - 3rem);
}
.ui[class*="very relaxed"][class*="vertically divided"].grid > .row:before {
- margin-left: 5rem;
- margin-right: 5rem;
- width: calc(100% - 5rem );
+ margin-left: 2.5rem;
+ margin-right: 2.5rem;
+ width: calc(100% - 5rem);
}
/*----------------------
@@ -24349,7 +24293,7 @@ Floated Menu / Item
}
.ui.tabular.fluid.menu {
- width: calc(100% + 2px ) !important;
+ width: calc(100% + (1px * 2)) !important;
}
.ui.tabular.menu .item {
@@ -24400,7 +24344,7 @@ Floated Menu / Item
.top.attached.segment + .ui.bottom.tabular.menu {
position: relative;
- width: calc(100% + 2px );
+ width: calc(100% + (1px * 2));
left: -1px;
}
@@ -25631,7 +25575,7 @@ Floated Menu / Item
}
.ui.menu.eight.item .item {
- width: 12.500%;
+ width: 12.5%;
}
.ui.menu.nine.item .item {
@@ -25639,7 +25583,7 @@ Floated Menu / Item
}
.ui.menu.ten.item .item {
- width: 10.0%;
+ width: 10%;
}
.ui.menu.eleven.item .item {
@@ -25813,8 +25757,8 @@ Floated Menu / Item
bottom: 0px;
border-radius: 0px;
margin: 0em -1px;
- width: calc(100% + 2px );
- max-width: calc(100% + 2px );
+ width: calc(100% - (-1px * 2));
+ max-width: calc(100% - (-1px * 2));
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -25971,7 +25915,7 @@ Floated Menu / Item
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Message
+ * # Semantic UI 2.4.2 - Message
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -26541,7 +26485,7 @@ Floated Menu / Item
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Table
+ * # Semantic UI 2.4.2 - Table
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -27164,8 +27108,8 @@ Floated Menu / Item
bottom: 0px;
border-radius: 0px;
margin: 0em -1px;
- width: calc(100% + 2px );
- max-width: calc(100% + 2px );
+ width: calc(100% - (-1px * 2));
+ max-width: calc(100% - (-1px * 2));
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid #D4D4D5;
@@ -27836,7 +27780,7 @@ Floated Menu / Item
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Ad
+ * # Semantic UI 2.4.2 - Ad
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -28125,7 +28069,7 @@ Floated Menu / Item
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Item
+ * # Semantic UI 2.4.2 - Item
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -29232,7 +29176,7 @@ a.ui.card:hover,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Comment
+ * # Semantic UI 2.4.2 - Comment
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -29518,7 +29462,7 @@ a.ui.card:hover,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Feed
+ * # Semantic UI 2.4.2 - Feed
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -29831,7 +29775,7 @@ a.ui.card:hover,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Item
+ * # Semantic UI 2.4.2 - Item
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -30352,7 +30296,7 @@ a.ui.card:hover,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Statistic
+ * # Semantic UI 2.4.2 - Statistic
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -30984,7 +30928,7 @@ a.ui.card:hover,
User Variable Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Accordion
+ * # Semantic UI 2.4.2 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -31247,7 +31191,7 @@ a.ui.card:hover,
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Checkbox
+ * # Semantic UI 2.4.2 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -31922,7 +31866,7 @@ a.ui.card:hover,
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Dimmer
+ * # Semantic UI 2.4.2 - Dimmer
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -32187,7 +32131,7 @@ body.dimmable > .dimmer {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Dropdown
+ * # Semantic UI 2.4.2 - Dropdown
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -33425,7 +33369,7 @@ select.ui.dropdown {
@media all and (-ms-high-contrast: none) {
.ui.scrolling.dropdown .menu,
.ui.dropdown .scrolling.menu {
- min-width: calc(100% - 17px );
+ min-width: calc(100% - 17px);
}
}
@@ -33845,7 +33789,7 @@ select.ui.dropdown {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Video
+ * # Semantic UI 2.4.2 - Video
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -34010,7 +33954,7 @@ select.ui.dropdown {
padding-bottom: 42.85714286%;
}
/*!
- * # Semantic UI 2.4.0 - Modal
+ * # Semantic UI 2.4.2 - Modal
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -34482,7 +34426,7 @@ select.ui.dropdown {
/* Scrolling Content */
.ui.modal .scrolling.content {
- max-height: calc(70vh);
+ max-height: calc(80vh - 10em);
overflow: auto;
}
@@ -34492,14 +34436,9 @@ select.ui.dropdown {
.ui.fullscreen.modal {
width: 95% !important;
- left: 0em !important;
margin: 1em auto;
}
-.ui.fullscreen.scrolling.modal {
- left: 0em !important;
-}
-
.ui.fullscreen.modal > .header {
padding-right: 2.25rem;
}
@@ -34696,7 +34635,7 @@ select.ui.dropdown {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Nag
+ * # Semantic UI 2.4.2 - Nag
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -34842,7 +34781,7 @@ a.ui.nag {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Popup
+ * # Semantic UI 2.4.2 - Popup
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -35672,7 +35611,7 @@ a.ui.nag {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Progress Bar
+ * # Semantic UI 2.4.2 - Progress Bar
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -36254,7 +36193,7 @@ a.ui.nag {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Rating
+ * # Semantic UI 2.4.2 - Rating
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -36531,7 +36470,7 @@ a.ui.nag {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Search
+ * # Semantic UI 2.4.2 - Search
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -37003,7 +36942,7 @@ a.ui.nag {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Shape
+ * # Semantic UI 2.4.2 - Shape
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -37163,7 +37102,7 @@ a.ui.nag {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Sidebar
+ * # Semantic UI 2.4.2 - Sidebar
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -37848,7 +37787,7 @@ body.pushable > .pusher {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Sticky
+ * # Semantic UI 2.4.2 - Sticky
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -37922,7 +37861,7 @@ body.pushable > .pusher {
Site Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Tab
+ * # Semantic UI 2.4.2 - Tab
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -38010,7 +37949,7 @@ body.pushable > .pusher {
User Overrides
*******************************/
/*!
- * # Semantic UI 2.4.0 - Transition
+ * # Semantic UI 2.4.2 - Transition
* http://github.com/semantic-org/semantic-ui/
*
*
diff --git a/src/main/resources/static/semanticui/semantic.js b/src/main/resources/static/semanticui/semantic.js
index bcd9649..28b6c3f 100644
--- a/src/main/resources/static/semanticui/semantic.js
+++ b/src/main/resources/static/semanticui/semantic.js
@@ -1,5 +1,5 @@
/*
- * # Semantic UI - 2.4.1
+ * # Semantic UI - 2.4.2
* https://github.com/Semantic-Org/Semantic-UI
* http://www.semantic-ui.com/
*
@@ -9,7 +9,7 @@
*
*/
/*!
- * # Semantic UI 2.4.1 - Site
+ * # Semantic UI 2.4.2 - Site
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -497,7 +497,7 @@ $.extend($.expr[ ":" ], {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Form Validation
+ * # Semantic UI 2.4.2 - Form Validation
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -2204,7 +2204,7 @@ $.fn.form.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Accordion
+ * # Semantic UI 2.4.2 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -2818,7 +2818,7 @@ $.extend( $.easing, {
/*!
- * # Semantic UI 2.4.1 - Checkbox
+ * # Semantic UI 2.4.2 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -3650,7 +3650,7 @@ $.fn.checkbox.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Dimmer
+ * # Semantic UI 2.4.2 - Dimmer
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -4384,7 +4384,7 @@ $.fn.dimmer.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Dropdown
+ * # Semantic UI 2.4.2 - Dropdown
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -8340,7 +8340,7 @@ $.fn.dropdown.settings.templates = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Embed
+ * # Semantic UI 2.4.2 - Embed
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -9047,7 +9047,7 @@ $.fn.embed.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Modal
+ * # Semantic UI 2.4.2 - Modal
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -10082,7 +10082,7 @@ $.fn.modal.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Nag
+ * # Semantic UI 2.4.2 - Nag
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -10590,7 +10590,7 @@ $.extend( $.easing, {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Popup
+ * # Semantic UI 2.4.2 - Popup
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -12123,7 +12123,7 @@ $.fn.popup.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Progress
+ * # Semantic UI 2.4.2 - Progress
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -13055,7 +13055,7 @@ $.fn.progress.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Rating
+ * # Semantic UI 2.4.2 - Rating
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -13564,7 +13564,7 @@ $.fn.rating.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Search
+ * # Semantic UI 2.4.2 - Search
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -15070,7 +15070,7 @@ $.fn.search.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Shape
+ * # Semantic UI 2.4.2 - Shape
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -15992,7 +15992,7 @@ $.fn.shape.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Sidebar
+ * # Semantic UI 2.4.2 - Sidebar
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -17026,7 +17026,7 @@ $.fn.sidebar.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Sticky
+ * # Semantic UI 2.4.2 - Sticky
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -17986,7 +17986,7 @@ $.fn.sticky.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Tab
+ * # Semantic UI 2.4.2 - Tab
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -18939,7 +18939,7 @@ $.fn.tab.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Transition
+ * # Semantic UI 2.4.2 - Transition
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -20035,7 +20035,7 @@ $.fn.transition.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - API
+ * # Semantic UI 2.4.2 - API
* http://github.com/semantic-org/semantic-ui/
*
*
@@ -21203,7 +21203,7 @@ $.api.settings = {
})( jQuery, window, document );
/*!
- * # Semantic UI 2.4.1 - Visibility
+ * # Semantic UI 2.4.2 - Visibility
* http://github.com/semantic-org/semantic-ui/
*
*
diff --git a/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.eot b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.eot
new file mode 100644
index 0000000..25066de
Binary files /dev/null and b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.eot differ
diff --git a/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.svg b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.svg
new file mode 100644
index 0000000..b9c54d0
--- /dev/null
+++ b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.svg
@@ -0,0 +1,450 @@
+
+
+
diff --git a/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.ttf b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.ttf
new file mode 100644
index 0000000..318a264
Binary files /dev/null and b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.ttf differ
diff --git a/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.woff b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.woff
new file mode 100644
index 0000000..baba1b5
Binary files /dev/null and b/src/main/resources/static/semanticui/themes/basic/assets/fonts/icons.woff differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.eot b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.eot
index e69de29..0a1ef3f 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.eot and b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.eot differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.ttf b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.ttf
index e69de29..f990851 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.ttf and b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.ttf differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff
index e69de29..2e87401 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff and b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff2 b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff2
index e69de29..0d575fd 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff2 and b/src/main/resources/static/semanticui/themes/default/assets/fonts/brand-icons.woff2 differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.eot b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.eot
index e69de29..ef75106 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.eot and b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.eot differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.otf b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.otf
index e69de29..f7936cc 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.otf and b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.otf differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.ttf b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.ttf
index e69de29..17bb674 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.ttf and b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.ttf differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff
index e69de29..4cf2a4f 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff and b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff2 b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff2
index e69de29..eea9aa2 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff2 and b/src/main/resources/static/semanticui/themes/default/assets/fonts/icons.woff2 differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.eot b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.eot
index e69de29..cda0a84 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.eot and b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.eot differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.ttf b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.ttf
index e69de29..ee13f84 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.ttf and b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.ttf differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff
index e69de29..bcd8343 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff and b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff differ
diff --git a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff2 b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff2
index e69de29..35cc7b3 100644
Binary files a/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff2 and b/src/main/resources/static/semanticui/themes/default/assets/fonts/outline-icons.woff2 differ
diff --git a/src/main/resources/templates/comm/commjs.ftl b/src/main/resources/templates/comm/commjs.ftl
index 69bfd74..5e30678 100644
--- a/src/main/resources/templates/comm/commjs.ftl
+++ b/src/main/resources/templates/comm/commjs.ftl
@@ -1,13 +1,17 @@
<#--jquery-->
+ src="https://lib.baomitu.com/jquery/3.4.1/jquery.min.js">
<#--semantic-ui-->
-
+
+<#-- -->
+
+
+<#--
+<#-- href="https://lib.baomitu.com/semantic-ui/2.4.1/semantic.min.css" rel="stylesheet">-->
-
+<#---->
<#--tinymce-->