rhodecode-enterprise-ce Files · rhodecode/public/css/mergerly.css

dependencies: Adding Bower out of nixpkgs...

dependencies: Adding Bower out of nixpkgs Usually bower would be installed globally, so it seems to be appropriate to use the one out of the nixpkgs so that we don't have to pin a specific version ourselves.

marcink - - Load All Authors

File last commit:

r347:99b6d323 default


                r709:a198b78f

default

Download file

             mergerly.css
        
                    49 lines
            
             | 1.8 KiB
            
                | text/css
            
             |
                CssLexer
            
             / rhodecode / public / css / mergerly.css
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marcink
    
project: added all source files and assets

              r1
            
      /* required */

      .mergely-column textarea { width: 80px; height: 200px; }

      .mergely-column { float: left; }

      .mergely-margin { float: left; }

      .mergely-canvas { float: left; width: 28px; }

      /* resizeable */

      .mergely-resizer { width: 100%; height: 100%; }

      /* style configuration */

      .mergely-column { border: 1px solid #ccc; }

      .mergely-active { border: 1px solid #a3d1ff; }

        marcink
    
js: updated mergely to 3.4.1

              r347
            
      .mergely.a,.mergely.d,.mergely.c { color: #000; }

        marcink
    
project: added all source files and assets

              r1
            
        marcink
    
js: updated mergely to 3.4.1

              r347
            
      .mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }

      .mergely.a.lhs.start.end,

      .mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }

      .mergely.a.rhs { background-color: #ddeeff; }

      .mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }

      .mergely.d.lhs { background-color: #ffe9e9; }

        marcink
    
project: added all source files and assets

              r1
            
      .mergely.d.lhs.end,

        marcink
    
js: updated mergely to 3.4.1

              r347
            
      .mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }

      .mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #f8e8e8; }

      .mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }

        marcink
    
project: added all source files and assets

              r1
            
      .mergely.c.lhs,

      .mergely.c.rhs { background-color: #fafafa; }

      .mergely.c.lhs.start,

      .mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }

      .mergely.c.lhs.end,

      .mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }

        marcink
    
js: updated mergely to 3.4.1

              r347
            
      .mergely.ch.a.rhs { background-color: #ddeeff; }

      .mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }

        marcink
    
project: added all source files and assets

              r1
            
      .mergely-margin #compare-lhs-margin,

      .mergely-margin #compare-rhs-margin {

          cursor: pointer

      }

        marcink
    
js: updated mergely to 3.4.1

              r347
            
      .mergely.current.start { border-top: 1px solid #000 !important; }

      .mergely.current.end { border-bottom: 1px solid #000 !important; }

      .mergely.current.lhs.a.start.end,

      .mergely.current.rhs.d.start.end { border-top: 0 !important; }

      .mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }

      .CodeMirror-linenumber { cursor: pointer; }

      .CodeMirror-code { color: #717171; }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

marcink project: added all source files and assets	r1	/* required */
		.mergely-column textarea { width: 80px; height: 200px; }
		.mergely-column { float: left; }
		.mergely-margin { float: left; }
		.mergely-canvas { float: left; width: 28px; }

		/* resizeable */
		.mergely-resizer { width: 100%; height: 100%; }

		/* style configuration */
		.mergely-column { border: 1px solid #ccc; }
		.mergely-active { border: 1px solid #a3d1ff; }

marcink js: updated mergely to 3.4.1	r347	.mergely.a,.mergely.d,.mergely.c { color: #000; }
marcink project: added all source files and assets	r1
marcink js: updated mergely to 3.4.1	r347	.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
		.mergely.a.lhs.start.end,
		.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
		.mergely.a.rhs { background-color: #ddeeff; }
		.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }

		.mergely.d.lhs { background-color: #ffe9e9; }
marcink project: added all source files and assets	r1	.mergely.d.lhs.end,
marcink js: updated mergely to 3.4.1	r347	.mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }
		.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #f8e8e8; }
		.mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }
marcink project: added all source files and assets	r1
		.mergely.c.lhs,
		.mergely.c.rhs { background-color: #fafafa; }
		.mergely.c.lhs.start,
		.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
		.mergely.c.lhs.end,
		.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }

marcink js: updated mergely to 3.4.1	r347	.mergely.ch.a.rhs { background-color: #ddeeff; }
		.mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }
marcink project: added all source files and assets	r1
		.mergely-margin #compare-lhs-margin,
		.mergely-margin #compare-rhs-margin {
		cursor: pointer
		}
marcink js: updated mergely to 3.4.1	r347
		.mergely.current.start { border-top: 1px solid #000 !important; }
		.mergely.current.end { border-bottom: 1px solid #000 !important; }
		.mergely.current.lhs.a.start.end,
		.mergely.current.rhs.d.start.end { border-top: 0 !important; }
		.mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }

		.CodeMirror-linenumber { cursor: pointer; }
		.CodeMirror-code { color: #717171; }