##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2642:b8db5763 default
r2784:e8c62649 default
Show More
tables.less
503 lines | 8.6 KiB | text/x-less | LessCssLexer
project: added all source files and assets
r1
// tables.less
// For use in RhodeCode application tables;
// see style guide documentation for guidelines.
// TABLES
.rctable,
table.rctable,
table.dataTable {
clear:both;
width: 100%;
margin: 0 auto @padding;
padding: 0;
vertical-align: baseline;
line-height:1.5em;
border: none;
outline: none;
border-collapse: collapse;
border-spacing: 0;
color: @grey2;
b {
font-weight: normal;
}
em {
font-weight: bold;
font-style: normal;
}
th,
td {
height: auto;
max-width: 20%;
padding: .65em 1em .65em 0;
vertical-align: middle;
border-bottom: @border-thickness solid @grey5;
white-space: normal;
&.td-radio,
&.td-checkbox {
padding-right: 0;
text-align: center;
input {
margin: 0 1em;
}
}
&.truncate-wrap {
white-space: nowrap !important;
}
pre {
margin: 0;
}
.show_more {
height: inherit;
}
}
.expired td {
background-color: @grey7;
}
.td-radio + .td-owner {
padding-left: 1em;
}
th {
text-align: left;
font-family: @text-semibold;
}
.hl {
td {
background-color: lighten(@alert4,25%);
}
}
// Special Data Cell Types
// See style guide for desciptions and examples.
td {
&.user {
padding-left: 1em;
}
&.td-rss {
width: 20px;
min-width: 0;
margin: 0;
}
&.quick_repo_menu {
width: 15px;
text-align: center;
&:hover {
background-color: @grey5;
}
}
&.td-hash {
min-width: 80px;
width: 200px;
mercurial-evolve: enable evolve setting on repositories.
r1738
.obsolete {
text-decoration: line-through;
color: lighten(@grey2,25%);
}
project: added all source files and assets
r1 }
&.td-time {
width: 160px;
white-space: nowrap;
}
&.annotate{
padding-right: 0;
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786
project: added all source files and assets
r1 div.annotatediv{
margin: 0 0.7em;
}
}
&.tags-col {
padding-right: 0;
}
&.td-description {
min-width: 350px;
meta-tags: fixes #4305, metatags are not taken into account when truncating output....
r1102
&.truncate, .truncate-wrap {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 450px;
}
project: added all source files and assets
r1 }
&.td-componentname {
white-space: nowrap;
}
perms-summary: fix long names overflow....
r2008 &.td-name {
}
project: added all source files and assets
r1 &.td-journalaction {
min-width: 300px;
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786 .journal_action_params {
project: added all source files and assets
r1 // waiting for feedback
}
}
&.td-active {
padding-left: .65em;
}
&.td-url {
white-space: nowrap;
}
&.td-comments {
min-width: 3em;
}
&.td-buttons {
padding: .3em 0;
}
&.td-action {
// this is for the remove/delete/edit buttons
padding-right: 0;
min-width: 95px;
text-transform: capitalize;
i {
display: none;
}
}
// TODO: lisa: this needs to be cleaned up with the buttons
.grid_edit,
.grid_delete {
display: inline-block;
margin: 0 @padding/3 0 0;
font-family: @text-light;
i {
display: none;
}
}
.grid_edit + .grid_delete {
border-left: @border-thickness solid @grey5;
padding-left: @padding/2;
}
&.td-compare {
input {
margin-right: 1em;
}
.compare-radio-button {
margin: 0 1em 0 0;
}
}
&.td-tags {
padding: .5em 1em .5em 0;
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786 width: 140px;
project: added all source files and assets
r1
.tag {
margin: 1px;
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786 float: left;
project: added all source files and assets
r1 }
}
.icon-svn, .icon-hg, .icon-git {
font-size: 1.4em;
}
&.collapse_commit,
&.expand_commit {
padding-right: 0;
padding-left: 1em;
}
}
.perm_admin_row {
color: @grey4;
background-color: @grey6;
}
.noborder {
border: none;
td {
border: none;
}
}
}
audit-logs: allow showing individual entries for audit log.
r2110 .rctable.audit-log {
td {
vertical-align: top;
}
}
project: added all source files and assets
r1
// TRUNCATING
// TODO: lisaq: should this possibly be moved out of tables.less?
// for truncated text
// used inside of table cells and in code block headers
.truncate-wrap {
white-space: nowrap !important;
//truncated text
.truncate {
max-width: 450px;
width: 300px;
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-ms-text-overflow: ellipsis;
&.autoexpand {
width: 120px;
margin-right: 200px;
}
}
&:hover .truncate.autoexpand {
overflow: visible;
}
.tags-truncate {
width: 150px;
height: 22px;
overflow: hidden;
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786
project: added all source files and assets
r1 .tag {
display: inline-block;
}
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786
project: added all source files and assets
r1 &.truncate {
height: 22px;
max-height:2em;
width: 140px;
}
}
}
.apikeys_wrap {
margin-bottom: @padding;
table.rctable td:first-child {
width: 340px;
}
}
// SPECIAL CASES
// Repository Followers
table.rctable.followers_data {
width: 75%;
margin: 0;
}
// Repository List
// Group Members List
table.rctable.group_members,
table#repo_list_table {
min-width: 600px;
}
// Keyboard mappings
table.keyboard-mappings {
th {
text-align: left;
font-family: @text-semibold;
}
}
// Branches, Tags, and Bookmarks
#obj_list_table.dataTable {
td.td-time {
padding-right: 1em;
}
}
// User Admin
.rctable.useremails,
.rctable.account_emails {
.tag,
.btn {
float: right;
}
.btn { //to line up with tags
margin-right: 1.65em;
}
}
// User List
#user_list_table {
td.td-user {
min-width: 100px;
}
}
// Pull Request List Table
#pull_request_list_table.dataTable {
//TODO: lisa: This needs to be removed once the description is adjusted
// for using an expand_commit button (see issue 765)
td {
vertical-align: middle;
}
}
// Settings (no border)
table.rctable.dl-settings {
td {
border: none;
}
}
// Statistics
table.trending_language_tbl {
width: 100%;
line-height: 1em;
td div {
overflow: visible;
}
}
.trending_language_tbl, .trending_language_tbl td {
border: 0;
margin: 0;
padding: 0;
background: transparent;
}
.trending_language_tbl, .trending_language_tbl tr {
border-spacing: 0 3px;
}
.trending_language {
position: relative;
width: 100%;
height: 19px;
overflow: hidden;
background-color: @grey6;
span, b{
position: absolute;
display: block;
height: 12px;
margin-bottom: 0px;
white-space: pre;
padding: floor(@basefontsize/4);
top: 0;
left: 0;
}
span{
color: @text-color;
z-index: 0;
min-width: 20px;
}
b {
z-index: 1;
overflow: hidden;
background-color: @rcblue;
color: #FFF;
text-decoration: none;
}
}
// Changesets
#changesets.rctable {
// td must be fixed height for graph
td {
height: 32px;
padding: 0 1em 0 0;
vertical-align: middle;
white-space: nowrap;
&.td-description {
white-space: normal;
}
&.expand_commit {
padding-right: 0;
}
}
}
dan
ux: show multiple tags/branches in changelog/summary instead of truncating
r786 // Compare
project: added all source files and assets
r1 table.compare_view_commits {
margin-top: @space;
td.td-time {
padding-left: .5em;
}
pull-requests: updated versioning support....
r1268 // special case to not show hover actions on hidden indicator
tr.compare_select_hidden:hover {
cursor: inherit;
td {
background-color: inherit;
}
}
project: added all source files and assets
r1 tr:hover {
cursor: pointer;
td {
background-color: lighten(@alert4,25%);
}
}
pull-requests: updated versioning support....
r1268
project: added all source files and assets
r1 }
.file_history {
td.td-actions {
text-align: right;
}
}
// Gist List
#gist_list_table {
td {
vertical-align: middle;
div{
display: inline-block;
vertical-align: middle;
}
img{
vertical-align: middle;
}
}
}