Skip to content

Commit

Permalink
Merge pull request #189 from freeciv/fix-line-endings-norm
Browse files Browse the repository at this point in the history
Force LF as EOL, so that it is not changed in Windows and the files can be used from the vagrant shared folder in the VM.

Current users may need to run these commands afterwards to normalize:

git rm --cached -r .
git reset --hard

See comments in #186 
Tested-by: @mchenryc
  • Loading branch information
lonemadmax authored Aug 26, 2018
2 parents 6a94b47 + d335098 commit 0491f9d
Show file tree
Hide file tree
Showing 10 changed files with 2,266 additions and 2,267 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
*.sh text eol=lf
*.txt text eol=lf
* text=auto eol=lf

158 changes: 79 additions & 79 deletions freeciv-web/src/main/webapp/css/bluecurve.css
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
/*
back: rgb(230,230,230)
dark: rgb(90,97,90)
medium rgb(189,190,189)
*/

.dynamic-slider-control {
position: relative;
-moz-user-focus: normal;
-moz-user-select: none;
cursor: default;
}

.horizontal {
width: 200px;
height: 27px;
}

.vertical {
width: 29px;
height: 200px;
}

.dynamic-slider-control input {
display: none;
}

.dynamic-slider-control .handle {
position: absolute;
font-size: 1px;
overflow: hidden;
-moz-user-select: none;
cursor: default;
}

.dynamic-slider-control.horizontal .handle {
width: 31px;
height: 14px;
background-image: url("/images/handle.horizontal.png");
}

.dynamic-slider-control.horizontal .handle div {}
.dynamic-slider-control.horizontal .handle.hover {}

.dynamic-slider-control.vertical .handle {
width: 15px;
height: 31px;
background-image: url("/images/handle.vertical.png");
}

.dynamic-slider-control.vertical .handle.hover {}

.dynamic-slider-control .line {
position: absolute;
font-size: 0.01mm;
overflow: hidden;
border: 1px solid rgb(90,97,90);
background: rgb(189,190,189);

behavior: url("css/boxsizing.htc"); /* ie path bug */
box-sizing: content-box;
-moz-box-sizing: content-box;
}
.dynamic-slider-control.vertical .line {
width: 3px;
}

.dynamic-slider-control.horizontal .line {
height: 3px;
}

.dynamic-slider-control .line div {
width: 1px;
height: 1px;

border: 1px solid;
border-color: rgb(230,230,230) rgb(189,190,189)
rgb(189,190,189) rgb(230,230,230);
}
/*
back: rgb(230,230,230)
dark: rgb(90,97,90)
medium rgb(189,190,189)
*/

.dynamic-slider-control {
position: relative;
-moz-user-focus: normal;
-moz-user-select: none;
cursor: default;
}

.horizontal {
width: 200px;
height: 27px;
}

.vertical {
width: 29px;
height: 200px;
}

.dynamic-slider-control input {
display: none;
}

.dynamic-slider-control .handle {
position: absolute;
font-size: 1px;
overflow: hidden;
-moz-user-select: none;
cursor: default;
}

.dynamic-slider-control.horizontal .handle {
width: 31px;
height: 14px;
background-image: url("/images/handle.horizontal.png");
}

.dynamic-slider-control.horizontal .handle div {}
.dynamic-slider-control.horizontal .handle.hover {}

.dynamic-slider-control.vertical .handle {
width: 15px;
height: 31px;
background-image: url("/images/handle.vertical.png");
}

.dynamic-slider-control.vertical .handle.hover {}

.dynamic-slider-control .line {
position: absolute;
font-size: 0.01mm;
overflow: hidden;
border: 1px solid rgb(90,97,90);
background: rgb(189,190,189);

behavior: url("css/boxsizing.htc"); /* ie path bug */
box-sizing: content-box;
-moz-box-sizing: content-box;
}
.dynamic-slider-control.vertical .line {
width: 3px;
}

.dynamic-slider-control.horizontal .line {
height: 3px;
}

.dynamic-slider-control .line div {
width: 1px;
height: 1px;

border: 1px solid;
border-color: rgb(230,230,230) rgb(189,190,189)
rgb(189,190,189) rgb(230,230,230);
}
Loading

0 comments on commit 0491f9d

Please sign in to comment.