Browse Source

fix-1250 修改间距样式

tags/V1.22.3.1^2
wangjr 3 years ago
parent
commit
0d1abe0beb
3 changed files with 42 additions and 72 deletions
  1. +3
    -47
      templates/org/home.tmpl
  2. +4
    -24
      templates/org/home_courses.tmpl
  3. +35
    -1
      web_src/less/openi.less

+ 3
- 47
templates/org/home.tmpl View File

@@ -1,47 +1,3 @@
<style>
.tag_key{
max-width:100%;
margin: 3px 3px;
display:inline-flex;
}
.tag_lable{
border: 1px solid rgba(232, 232, 232, 100) ;
border-radius: 4px;
color: rgba(65, 80, 88, 100);
font-family: Microsoft Yahei;
font-size: 14px;
padding: 0.3em 0.5em;
height: 30px;
text-align: center;
margin: 0.2em;
}
.tag_lable_first{
border: 1px solid rgba(232, 232, 232, 100) ;
border-radius: 4px;
color: rgba(65, 80, 88, 100);
font-family: Microsoft Yahei;
font-size: 14px;
padding: 0.3em 0.5em;
height: 30px;
text-align: center;
margin: 0.2em;
margin-left: none;
}
.omit{
overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
}
.tag_bg{
background-color: #0366D6 !important;
color:#FFFFFF !important;
}
.margin-top20{
margin-top: 20px;
}
.maxheight{
max-height: 88px;
overflow: hidden;
}
</style>
{{template "base/head" .}} {{template "base/head" .}}
<div class="organization profile"> <div class="organization profile">
{{/* overflow: auto is the clearfix - this avoids the image going beyond {{/* overflow: auto is the clearfix - this avoids the image going beyond
@@ -70,7 +26,7 @@
<div class="ui sixteen wide computer column"> <div class="ui sixteen wide computer column">
<div class="ui mobile reversed stackable grid"> <div class="ui mobile reversed stackable grid">
<div class="ui sixteen wide tablet sixteen wide computer column margin-top20 maxheight" id='key_tag'>
<div class="ui sixteen wide tablet sixteen wide computer column margin-top20 pad-botom maxheight" id='key_tag'>
{{if .OrgTopics}} {{if .OrgTopics}}
<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?" >{{$.i18n.Tr "org.all_org_topics"}}</span></a> <a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?" >{{$.i18n.Tr "org.all_org_topics"}}</span></a>
{{end}} {{end}}
@@ -83,8 +39,8 @@
{{end}} {{end}}
{{end}} {{end}}
</div> </div>
<div style="width: 100%;margin:-3px 5px 10px;">
<a class="text-right" onclick="isUnfold()" id="icon_btn"><i class="ri-arrow-down-s-line" style="display:inline-block;vertical-align:top"></i>&nbsp{{.i18n.Tr "org.fold"}}</a>
<div style="width: 100%;margin:5px 5px 10px;">
<a class="text-right" onclick="isUnfold()" id="icon_btn"><i class="ri-arrow-down-s-line" style="display:inline-block;vertical-align:top"></i>&nbsp{{.i18n.Tr "org.unfold"}}</a>
</div> </div>
</div> </div>


+ 4
- 24
templates/org/home_courses.tmpl View File

@@ -32,27 +32,13 @@
.organization-info >.container { .organization-info >.container {
padding-bottom:0px !important; padding-bottom:0px !important;
} }
.tag_bg{
background-color: #0366D6 !important;
color:#FFFFFF !important;
}
.course{ .course{
padding:10px 0 15px !important; padding:10px 0 15px !important;
} }
.course_color{ .course_color{
color: #FA8C16; color: #FA8C16;
} }
.tag_lable{
border: 1px solid rgba(232, 232, 232, 100) ;
border-radius: 4px;
color: rgba(65, 80, 88, 100);
font-family: Microsoft Yahei;
font-size: 14px;
padding: 0.3em 0.5em;
height: 30px;
text-align: center;
margin: 0.2em;
}
.tag_lable_first{ .tag_lable_first{
border: 1px solid rgba(232, 232, 232, 100) ; border: 1px solid rgba(232, 232, 232, 100) ;
border-radius: 4px; border-radius: 4px;
@@ -65,17 +51,11 @@
margin: 0.2em; margin: 0.2em;
margin-left: none; margin-left: none;
} }
.tag_key{
max-width:100%;
margin: 3px 3px;
display:inline-flex;
}

.bpadding{ .bpadding{
padding:10px 40px padding:10px 40px
} }
.omit{
overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
}

.noborder{ .noborder{
border: none !important; border: none !important;
} }
@@ -83,7 +63,7 @@
text-align: center; text-align: center;
margin-top: 5px; margin-top: 5px;
margin-top: 10px; margin-top: 10px;
}
}
</style> </style>


+ 35
- 1
web_src/less/openi.less View File

@@ -734,4 +734,38 @@ display: block;
} }
.el-pagination.is-background .el-pager li:hover { .el-pagination.is-background .el-pager li:hover {
color: #5bb973 !important; color: #5bb973 !important;
}
}

.tag_key{
max-width:100%;
margin: 3px 3px;
display:inline-flex;
}
.tag_lable{
border: 1px solid rgba(232, 232, 232, 100) ;
border-radius: 4px;
color: rgba(65, 80, 88, 100);
font-family: Microsoft Yahei;
font-size: 14px;
padding: 0.3em 0.5em;
height: 30px;
text-align: center;
margin: 0.2em;
}
.omit{
overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
}
.tag_bg{
background-color: #0366D6 !important;
color:#FFFFFF !important;
}
.margin-top20{
margin-top: 20px;
}
.maxheight{
max-height: 88px;
overflow: hidden;
}
.pad-botom{
padding-bottom:0px !important;
}

Loading…
Cancel
Save