Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zhgh
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhou Yang
zhgh
Commits
c0739901
Commit
c0739901
authored
Mar 25, 2019
by
xiujunlian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2019.03.25附件路径修改
parent
6a6313db
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
17 deletions
+0
-17
servicePlatformxin.png
beansprouts-web/src/main/webapp/img/servicePlatformxin.png
+0
-0
yangguanggonghuixin.png
beansprouts-web/src/main/webapp/img/yangguanggonghuixin.png
+0
-0
zuzhigaikuangxin.png
beansprouts-web/src/main/webapp/img/zuzhigaikuangxin.png
+0
-0
index.css
beansprouts-web/src/main/webapp/qt/css/index.css
+0
-17
No files found.
beansprouts-web/src/main/webapp/img/servicePlatformxin.png
0 → 100644
View file @
c0739901
3.05 KB
beansprouts-web/src/main/webapp/img/yangguanggonghuixin.png
0 → 100644
View file @
c0739901
3.64 KB
beansprouts-web/src/main/webapp/img/zuzhigaikuangxin.png
0 → 100644
View file @
c0739901
3.19 KB
beansprouts-web/src/main/webapp/qt/css/index.css
View file @
c0739901
...
...
@@ -74,13 +74,8 @@
}
.main
.announcement
ul
{
<<<<<<<
Updated
upstream
width
:
254px
;
height
:
215px
;
=======
width
:
185px
;
height
:
249px
;
>>>>>>>
Stashed
changes
border
:
1px
solid
#CCCCCC
;
box-sizing
:
border-box
;
overflow
:
hidden
;
...
...
@@ -114,24 +109,12 @@
.main
.announcement
.news-content
a
{
width
:
244px
;}
.main
.announcement
.icon-gonggao
{
font-size
:
24px
;
color
:
#d81e06
;
vertical-align
:
middle
;}
<<<<<<<
Updated
upstream
.main
.announcement
div
{
width
:
254px
;}
.main
.announcement
img
{
width
:
254px
;
height
:
60px
;
display
:
block
;
}
=======
.main
.announcement
div
{
width
:
185px
;
margin-right
:
5px
;
height
:
165px
;}
.main
.announcement
img
{
width
:
185px
;
height
:
74px
;}
.secondaryListImg
a
{
display
:
block
;
}
.secondaryListImg
a
:last-child
{
transform
:
translateY
(
-10px
);
}
>>>>>>>
Stashed
changes
.announcementImg
a
{
display
:
block
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment